hps-java/src/main/java/org/lcsim/hps/recon/tracking

diff -u -r1.3 -r1.4
--- MultipleScattering.java	14 Jul 2013 06:50:02 -0000	1.3
+++ MultipleScattering.java	23 Jul 2013 22:19:26 -0000	1.4
@@ -10,6 +10,7 @@

 import java.util.Collections;
 import java.util.List;
 import org.lcsim.detector.IDetectorElement;

+import org.lcsim.detector.solids.Box;

 import org.lcsim.detector.solids.Inside;
 import org.lcsim.detector.tracker.silicon.ChargeCarrier;
 import org.lcsim.fit.helicaltrack.HelicalTrackFit;

@@ -93,7 +94,7 @@

             Hep3Vector pos = getHelixIntersection(helix,vol);
 
             if(pos!=null) {

-                

+

                 if(_debug) System.out.printf("%s: intersection position %s\n",this.getClass().getSimpleName(),pos.toString());
 
                 // find the track direction at the plane

@@ -229,8 +230,8 @@

         
         if(this._debug) System.out.printf("%s: Inside result sensor: %s module: %s\n",
                                 this.getClass().getSimpleName(), 

-                                (result_inside.equals(Inside.INSIDE) ? "INSIDE" : (result_inside.equals(Inside.OUTSIDE) ? "OUTSIDE": (result_inside.equals(Inside.SURFACE) ? "SURFACE":"NO IDEA"))),
-                                (result_inside_module.equals(Inside.INSIDE) ? "INSIDE" : (result_inside_module.equals(Inside.OUTSIDE) ? "OUTSIDE": (result_inside_module.equals(Inside.SURFACE) ? "SURFACE":"NO IDEA"))));

+                                result_inside.toString(),
+                                result_inside_module.toString());

@@ -246,12 +247,12 @@

 
         
         boolean isInside = true;

-        if(Math.abs(pos_int.x()) > plane.getMeasuredDimension()/2.0) {

+        if(Math.abs(pos_int.x()) > ((Box)plane.getSensor().getGeometry().getLogicalVolume().getSolid()).getXHalfLength()) {

             if(this._debug) System.out.printf("%s: intercept is outside in u\n", this.getClass().getSimpleName());
             isInside = false;
         }
         

-        if(Math.abs(pos_int.y()) > plane.getUnmeasuredDimension()/2.0) {

+        if(Math.abs(pos_int.y()) > ((Box)plane.getSensor().getGeometry().getLogicalVolume().getSolid()).getYHalfLength()) {

             if(this._debug) System.out.printf("%s: intercept is outside in v\n", this.getClass().getSimpleName());
             isInside = false;
         }

@@ -324,8 +325,8 @@

         
         if(this._debug) System.out.printf("%s: Inside result sensor: %s module: %s\n",
                                 this.getClass().getSimpleName(), 

-                                (result_inside.equals(Inside.INSIDE) ? "INSIDE" : (result_inside.equals(Inside.OUTSIDE) ? "OUTSIDE": (result_inside.equals(Inside.SURFACE) ? "SURFACE":"NO IDEA"))),
-                                (result_inside_module.equals(Inside.INSIDE) ? "INSIDE" : (result_inside_module.equals(Inside.OUTSIDE) ? "OUTSIDE": (result_inside_module.equals(Inside.SURFACE) ? "SURFACE":"NO IDEA"))));

+                                result_inside.toString(),
+                                result_inside_module.toString());

@@ -339,7 +340,7 @@

             isInsideSolidModule = true;
         }
 

-        

+

         isInside = true;
         if(Math.abs(pos_int.x()) > plane.getMeasuredDimension()/2.0) {
             if(this._debug) System.out.printf("%s: intercept is outside in u\n", this.getClass().getSimpleName());