Commit in lcsim/src/org/lcsim/event/base on MAIN
BaseSimTrackerHit.java+3-121.9 -> 1.10
use position of SimTrackerHit to find DetectorElement; can't use identifiers because of duplication problem

lcsim/src/org/lcsim/event/base
BaseSimTrackerHit.java 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- BaseSimTrackerHit.java	25 Mar 2009 01:43:12 -0000	1.9
+++ BaseSimTrackerHit.java	20 Apr 2009 23:37:30 -0000	1.10
@@ -164,20 +164,11 @@
     {
         if (de == null)
         {
-            IDetectorElementContainer srch = getSubdetector().getDetectorElement().findDetectorElement(getIdentifier());
-            if (srch.size() == 1)
+            de = getSubdetector().getDetectorElement().findDetectorElement(getPositionVec());
+            if (de == null)
             {
-                de = srch.get(0);
-            }
-            else if (srch.size() == 0)
-            {
-                throw new RuntimeException("No DetectorElement found for SimTrackerHit with id <" + getIdentifier().toHexString() + ">.");
+            	throw new RuntimeException("No DetectorElement found for SimTrackerHit with position " + this.getPositionVec() + ".");
             }            
-            // Should not happen.  Check anyways.
-            else if (srch.size() > 1)
-            {
-                throw new RuntimeException("Found multiple DetectorElements matching id <" + getIdentifier().toHexString() + ">.");
-            }
         }
         return de;
     }
CVSspam 0.2.8