lcsim/src/org/lcsim/contrib/SteveMagill
diff -u -r1.1 -r1.2
--- TSCForDriver.java 20 Aug 2008 20:20:44 -0000 1.1
+++ TSCForDriver.java 21 Aug 2008 15:16:38 -0000 1.2
@@ -1,4 +1,4 @@
-package org.lcsim.contrib.SteveMagill;
+// package org.lcsim.contrib.compile.SteveMagill;
// This driver associates calorimeter clusters to extrapolated tracks, testing both
// cluster-track distance and E/p, iterating in cone around track until E/p min is reached
@@ -394,54 +394,55 @@
// add section for breaking up large clusters when E/p > max value
// not used now
- CoreReclusterer cr = new CoreReclusterer();
- for (Track jtr : trkclusmap.keySet())
- {
+// CoreReclusterer cr = new CoreReclusterer();
+// for (Track jtr : trkclusmap.keySet())
+// {
// for this track, get E of cluster / p of track
- double[] tmc = jtr.getMomentum();
- double tmp = Math.sqrt(tmc[0]*tmc[0]+tmc[1]*tmc[1]+tmc[2]*tmc[2]);
- BasicCluster tcl = trkclusmap.get(jtr);
- double clE = tcl.getEnergy();
- double eprat = clE/tmp;
- if (trshdb) aida.cloud1D("E over P from Track Cluster Map").fill(eprat);
- if (eprat>_maxeop)
- {
+// double[] tmc = jtr.getMomentum();
+// double tmp = Math.sqrt(tmc[0]*tmc[0]+tmc[1]*tmc[1]+tmc[2]*tmc[2]);
+// BasicCluster tcl = trkclusmap.get(jtr);
+// double clE = tcl.getEnergy();
+// double eprat = clE/tmp;
+// if (trshdb) aida.cloud1D("E over P from Track Cluster Map").fill(eprat);
+// if (eprat>_maxeop)
+// {
// re-cluster hits in this cluster
- if (trshdb) aida.cloud1D("E over P for recluster candidates").fill(eprat);
- Cluster oclus = (Cluster) trkclusmap.get(jtr);
- if (trshdb) aida.cloud1D("Hits in Cluster").fill(oclus.getSize());
- if (trshdb) aida.cloud1D("Number of clusters in TCCluster").fill(oclus.getClusters().size());
- for (Cluster tccls : oclus.getClusters())
- {
- if (trshdb) aida.cloud1D("Ratio of tcclusterE to Track P").fill(tccls.getEnergy()/tmp);
- if (tccls.getEnergy()/tmp>_maxeop)
- {
+// if (trshdb) aida.cloud1D("E over P for recluster candidates").fill(eprat);
+// Cluster oclus = (Cluster) trkclusmap.get(jtr);
+// if (trshdb) aida.cloud1D("Hits in Cluster").fill(oclus.getSize());
+// if (trshdb) aida.cloud1D("Number of clusters in TCCluster").fill(oclus.getClusters().size());
+// for (Cluster tccls : oclus.getClusters())
+// {
+// if (trshdb) aida.cloud1D("Ratio of tcclusterE to Track P").fill(tccls.getEnergy()/tmp);
+// if (tccls.getEnergy()/tmp>_maxeop)
+// {
//try to recluster this cluster
- List<Cluster> screclus = cr.reclusterCluster(tccls);
- if (trshdb) aida.cloud1D("Number of reclusters for sing clus").fill(screclus.size());
- if (screclus.size()>0)
- {
- for (Cluster scrc : screclus)
- {
- if (trshdb) aida.cloud1D("Ratio of screclusE and Track P").fill(scrc.getEnergy()/tmp);
- }
- }
- }
- }
- List<Cluster> nreclus = cr.reclusterCluster(oclus);
- if (trshdb) aida.cloud1D("Number of reclusters").fill(nreclus.size());
- if (nreclus.size()>0)
- {
- event.put("reclusters",nreclus);
- for (Cluster reclus : nreclus)
- {
- if (trshdb) aida.cloud1D("Number of Hits in reclusters").fill(reclus.getSize());
- if (trshdb) aida.cloud1D("Energy of reclusters").fill(reclus.getEnergy());
- if (trshdb) aida.cloud1D("Ratio of reclusE and Track P").fill(reclus.getEnergy()/tmp);
- }
- }
- }
- }
+// List<Cluster> screclus = cr.reclusterCluster(tccls);
+// if (trshdb) aida.cloud1D("Number of reclusters for sing clus").fill(screclus.size());
+// if (screclus.size()>0)
+// {
+// for (Cluster scrc : screclus)
+// {
+// if (trshdb) aida.cloud1D("Ratio of screclusE and Track P").fill(scrc.getEnergy()/tmp);
+// }
+// }
+// }
+// }
+// List<Cluster> nreclus = cr.reclusterCluster(oclus);
+// if (trshdb) aida.cloud1D("Number of reclusters").fill(nreclus.size());
+// if (nreclus.size()>0)
+// {
+// event.put("reclusters",nreclus);
+// for (Cluster reclus : nreclus)
+// {
+// if (trshdb) aida.cloud1D("Number of Hits in reclusters").fill(reclus.getSize());
+// if (trshdb) aida.cloud1D("Energy of reclusters").fill(reclus.getEnergy());
+// if (trshdb) aida.cloud1D("Ratio of reclusE and Track P").fill(reclus.getEnergy()/tmp);
+// }
+// }
+// }
+// }
+
}
public void setClusterNames(String[] names)