Print

Print


Commit in hps-java/src/main/java/org/lcsim/hps/recon/tracking on MAIN
MultipleScattering.java+4-51.4 -> 1.5
use total sensor dimensions, not sensitive volume dimensions

hps-java/src/main/java/org/lcsim/hps/recon/tracking
MultipleScattering.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- MultipleScattering.java	23 Jul 2013 22:19:26 -0000	1.4
+++ MultipleScattering.java	31 Jul 2013 17:21:49 -0000	1.5
@@ -225,7 +225,7 @@
                                         this.getClass().getSimpleName(), delta_w, pos_int, pos_int_det.toString(), pos_int_trk.toString());
         
         // check if it's inside the sensor
-        Inside result_inside = plane.getSensor().getGeometry().inside(pos_int_det);
+        Inside result_inside = plane.getDetectorElement().getGeometry().getPhysicalVolume().getMotherLogicalVolume().getSolid().inside(pos_int);
         Inside result_inside_module = plane.getSensor().getGeometry().getDetectorElement().getParent().getGeometry().inside(pos_int_det);
         
         if(this._debug) System.out.printf("%s: Inside result sensor: %s module: %s\n",
@@ -247,12 +247,12 @@
 
         
         boolean isInside = true;
-        if(Math.abs(pos_int.x()) > ((Box)plane.getSensor().getGeometry().getLogicalVolume().getSolid()).getXHalfLength()) {
+        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());
             isInside = false;
         }
         
-        if(Math.abs(pos_int.y()) > ((Box)plane.getSensor().getGeometry().getLogicalVolume().getSolid()).getYHalfLength()) {
+        if(Math.abs(pos_int.y()) > plane.getUnmeasuredDimension()/2.0) {
             if(this._debug) System.out.printf("%s: intercept is outside in v\n", this.getClass().getSimpleName());
             isInside = false;
         }
@@ -319,8 +319,7 @@
         
         if(this._debug) System.out.printf("%s: found iterative helix intercept in sensor coordinates at %s\n",
                 this.getClass().getSimpleName(),pos_int_sensor.toString());
-
-        result_inside = plane.getSensor().getGeometry().inside(pos_int_det);
+        result_inside = plane.getDetectorElement().getGeometry().getPhysicalVolume().getMotherLogicalVolume().getSolid().inside(pos_int_sensor);
         result_inside_module = plane.getSensor().getGeometry().getDetectorElement().getParent().getGeometry().inside(pos_int_det);
         
         if(this._debug) System.out.printf("%s: Inside result sensor: %s module: %s\n",
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1