Print

Print


Commit in lcsim/src/org/lcsim on MAIN
util/heprep/DisplayHitModules.java+1-11.3 -> 1.4
fit/helicaltrack/HelicalTrackHitDriver.java+3-31.12 -> 1.13
+4-4
2 modified files
CD - Use .getIdentifier() on SimTrackerHit to obtain identifier

lcsim/src/org/lcsim/util/heprep
DisplayHitModules.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- DisplayHitModules.java	15 May 2008 09:19:54 -0000	1.3
+++ DisplayHitModules.java	7 Jul 2008 18:59:20 -0000	1.4
@@ -72,7 +72,7 @@
         for (SimTrackerHit h : (List<SimTrackerHit>) collection) {
             
             //get the right sensor
-            IIdentifier id = new Identifier(h.getCellID()); 
+            IIdentifier id = h.getIdentifier(); 
             IDetectorElementContainer de = DetectorElementStore.getInstance().find(id); 
             
             if (de.size() > 0)

lcsim/src/org/lcsim/fit/helicaltrack
HelicalTrackHitDriver.java 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- HelicalTrackHitDriver.java	4 Jul 2008 00:07:08 -0000	1.12
+++ HelicalTrackHitDriver.java	7 Jul 2008 18:59:20 -0000	1.13
@@ -22,7 +22,6 @@
 import org.lcsim.contrib.onoprien.tracking.geom.Sensor;
 import org.lcsim.contrib.onoprien.tracking.hit.DigiTrackerHit;
 import org.lcsim.contrib.onoprien.tracking.hit.TrackerCluster;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.hitmakers.TrackerHitMakerBasic;
 import org.lcsim.detector.DetectorElementStore;
 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.IDetectorElementContainer;
@@ -72,7 +71,6 @@
         Digitized
                 
     }
-    private TrackerHitMakerBasic _hitmaker = new TrackerHitMakerBasic();
     private StereoHitMaker _crosser = new StereoHitMaker(10., 10.);
     private HitIdentifier ID = new HitIdentifier();
     private SegmentationManager _segman;
@@ -109,7 +107,7 @@
                 
                 try {
                     SimTrackerHit simhit = ((BaseTrackerHitMC)hit).getSimHits().get(0); 
-                    IDetectorElementContainer cont = DetectorElementStore.getInstance().find(new Identifier(simhit.getCellID())); 
+                    IDetectorElementContainer cont = DetectorElementStore.getInstance().find(simhit.getIdentifier()); 
                     if (cont.isEmpty()) {
                         throw new RuntimeException("Detector Container is empty!");
                     } else {
@@ -125,6 +123,7 @@
                                 detname, lyr, ID.getBarrelEndcapFlag(de));
                         
                         for (MCParticle p : ((BaseTrackerHitMC)hit).mcParticles()) hthit.addMCParticle(p);
+                        System.out.println("smeared: "+hthit.getMCParticles().size()); 
                         helhits.add(hthit);
                     }
                     
@@ -392,6 +391,7 @@
                  vmin, vmax, dEdx, time, rawhits, det, lyr, be);
          
          for (MCParticle p : h.getMCParticles()) strip.addMCParticle(p);
+         System.out.println("strip: "+strip.MCParticles().size()); 
          return strip; 
     }
     
CVSspam 0.2.8