Commit in lcsim/src/org/lcsim on MAIN
recon/tracking/digitization/sisim/TrackerHitDriver_User.java+3-31.1 -> 1.2
util/heprep/DisplayHitModules.java+11-171.5 -> 1.6
+14-20
2 modified files


lcsim/src/org/lcsim/recon/tracking/digitization/sisim
TrackerHitDriver_User.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TrackerHitDriver_User.java	24 Apr 2009 01:22:58 -0000	1.1
+++ TrackerHitDriver_User.java	24 Apr 2009 19:51:33 -0000	1.2
@@ -25,9 +25,9 @@
     {
         _trackerhit_driver = new TrackerHitDriver();
         
-        _trackerhit_driver.addReadout("SiTrackerBarrel_RO");
-        _trackerhit_driver.addReadout("SiTrackerEndcap_RO");
-        _trackerhit_driver.addReadout("SiTrackerForward_RO");
+        _trackerhit_driver.setReadout("SiTrackerBarrel_RO");
+        _trackerhit_driver.setReadout("SiTrackerEndcap_RO");
+        _trackerhit_driver.setReadout("SiTrackerForward_RO");
         //_trackerhit_driver.addReadout("SiVertexBarrel_RO");
         //_trackerhit_driver.addReadout("SiVertexEndcap_RO");
         _trackerhit_driver.addElementToProcess("SiTrackerBarrel");

lcsim/src/org/lcsim/util/heprep
DisplayHitModules.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- DisplayHitModules.java	4 Mar 2009 03:12:19 -0000	1.5
+++ DisplayHitModules.java	24 Apr 2009 19:51:33 -0000	1.6
@@ -70,25 +70,19 @@
         
         Set<IDetectorElement> alreadyMade = new HashSet<IDetectorElement>(); 
         
-        for (SimTrackerHit h : (List<SimTrackerHit>) collection) {
+        for (SimTrackerHit h : (List<SimTrackerHit>) collection) 
+        {
+        	// find sensor
+        	IDetectorElement sensor = h.getDetectorElement(); 
+                     
+        	//make sure we don't have repeats
+            if (!alreadyMade.add(sensor)) continue; 
             
-            //get the right sensor
-            IIdentifier id = h.getIdentifier(); 
-            IDetectorElementContainer de = DetectorElementStore.getInstance().find(id); 
+            //get the module from the sensor 
+            IDetectorElement module = sensor.getParent(); 
             
-            if (de.size() > 0)
-            {
-            	IDetectorElement sensor = de.get(0);
-            
-            	//make sure we don't have repeats
-            	if (!alreadyMade.add(sensor)) continue; 
-            
-            	//get the module from the sensor 
-            	IDetectorElement module = sensor.getParent(); 
-            
-            	drawPolyhedron(sensor,typeS,instanceTree,factory); 
-            	drawPolyhedron(module,typeM,instanceTree,factory); 
-            }
+            drawPolyhedron(sensor,typeS,instanceTree,factory); 
+            drawPolyhedron(module,typeM,instanceTree,factory); 
         }
     }
     
CVSspam 0.2.8