lcsim/test/org/lcsim/contrib/tracking
diff -u -r1.1 -r1.2
--- TrackerHitCheaterTest.java 15 Jul 2007 06:34:34 -0000 1.1
+++ TrackerHitCheaterTest.java 16 Jul 2007 20:14:09 -0000 1.2
@@ -8,6 +8,7 @@
import org.lcsim.geometry.Detector;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.TrackerHit;
+import org.lcsim.event.base.BaseTrackerHitMC;
import org.lcsim.util.Driver;
import org.lcsim.util.cache.FileCache;
import org.lcsim.util.loop.LCSimLoop;
@@ -63,14 +64,22 @@
// Get the SimTrackerHits
List<SimTrackerHit> simulated_hits = event.get(SimTrackerHit.class, "SiTrackerBarrel_RO");
- System.out.println("Nubmer of input SimTrackerHits: "+simulated_hits.size());
+ System.out.println("Number of input SimTrackerHits: "+simulated_hits.size());
// Make a TrackerHitCheater
TrackerHitCheater hit_cheater = new TrackerHitCheater();
List<TrackerHit> tracker_hits = hit_cheater.makeTrackerHits(simulated_hits);
- System.out.println("Nubmer of output TrackerHits: "+tracker_hits.size());
+ System.out.println("Number of output TrackerHits: "+tracker_hits.size());
+ for (TrackerHit hit : tracker_hits)
+ {
+ System.out.println("Location of output TrackerHit: ["+hit.getPosition()[0]+
+ ","+hit.getPosition()[1]+
+ ","+hit.getPosition()[2]+"]");
+ System.out.println("Number of MCParticles contributing: "+((BaseTrackerHitMC)hit).mcParticles().size());
+ System.out.println("Number of MCParticles contributing: "+((BaseTrackerHitMC)hit).getSimHits().size());
+ }
// event.put("CheatedTrackerHits",trackerhits,BaseTrackerHitMC.class,0);
}
lcsim/src/org/lcsim/contrib/tracking
diff -u -r1.1 -r1.2
--- TrackerHitCheater.java 15 Jul 2007 06:34:35 -0000 1.1
+++ TrackerHitCheater.java 16 Jul 2007 20:14:10 -0000 1.2
@@ -74,11 +74,11 @@
{
for (SimTrackerHit hit : unclustered_hits)
{
- double max_dist = Math.max(_max_dist,(seed_hit.getPathLength()+hit.getPathLength())/2.0);
+ double max_dist = Math.max(_max_dist,(seed_hit.getPathLength()+hit.getPathLength())/2.0*1.01);
Hep3Vector seed_point = new BasicHep3Vector(seed_hit.getPoint());
Hep3Vector hit_point = new BasicHep3Vector(hit.getPoint());
- if (VecOp.sub(hit_point,seed_point).magnitude() < max_dist)
+ if (VecOp.sub(hit_point,seed_point).magnitude() <= max_dist)
{
nearby_hits.add(hit);
}