Print

Print


Commit in GeomConverter/src/org/lcsim/detector/converter/compact on MAIN
CylindricalBarrelCalorimeterConverter.java+71.16 -> 1.17
CylindricalEndcapCalorimeterConverter.java+8-11.20 -> 1.21
+15-1
2 modified files
workaround for older detectors (should fix problem reported by Rich)

GeomConverter/src/org/lcsim/detector/converter/compact
CylindricalBarrelCalorimeterConverter.java 1.16 -> 1.17
diff -u -r1.16 -r1.17
--- CylindricalBarrelCalorimeterConverter.java	23 Mar 2009 18:51:29 -0000	1.16
+++ CylindricalBarrelCalorimeterConverter.java	25 Mar 2009 02:32:21 -0000	1.17
@@ -163,6 +163,13 @@
 				// TODO: needs identifier
                 if ( slice.isSensitive() )
                 {
+                    // FIXME: Hack to fix old detectors like sid02.  Remove when these are retired.
+                    if (sensorNumber > 0 && !helper.hasField("slice"))
+                    {
+                        System.out.println("Not creating second sensor, because id is missing a slice field!");
+                        break;
+                    }
+                    
     				pvSlice.setSensitive(true);
                 	
                     // Path to the PhysicalVolume of this sensor.

GeomConverter/src/org/lcsim/detector/converter/compact
CylindricalEndcapCalorimeterConverter.java 1.20 -> 1.21
diff -u -r1.20 -r1.21
--- CylindricalEndcapCalorimeterConverter.java	25 Mar 2009 00:28:42 -0000	1.20
+++ CylindricalEndcapCalorimeterConverter.java	25 Mar 2009 02:32:21 -0000	1.21
@@ -106,7 +106,14 @@
                 String sliceName = "slice" + j;
                 LayerSlice slice = layer.getSlice(j);
                 if ( slice.isSensitive() )
-                {                   
+                {       
+                    // FIXME: Hack to fix old detectors like sid02.  Remove when these are retired.
+                    if (sensorNumber > 0 && !helper.hasField("slice"))
+                    {
+                        System.out.println("Not creating second sensor, because id is missing a slice field!");
+                        break;
+                    }
+                    
                     // Create an endcap sensor.
                     String pathName = "/" + cal.getName() + "_positive" + "/" + layerName + "/" + sliceName; 
                     
CVSspam 0.2.8