GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.19 -r1.20
--- CylindricalEndcapCalorimeterConverter.java 23 Mar 2009 18:51:29 -0000 1.19
+++ CylindricalEndcapCalorimeterConverter.java 25 Mar 2009 00:28:42 -0000 1.20
@@ -29,7 +29,7 @@
implements ISubdetectorConverter
{
public void convert( Subdetector subdet, Detector detector)
- {
+ {
CylindricalEndcapCalorimeter cal = (CylindricalEndcapCalorimeter)subdet;
IPhysicalVolume world = detector.getWorldVolume();
@@ -121,39 +121,40 @@
if (helper.hasField("slice"))
expid.setValue(helper.getFieldIndex("slice"), j);
IIdentifier id = helper.pack(expid);
-
+
new DetectorElement(
cal.getName() + "_positive_layer" + layerNumber + "_sensor" + sensorNumber,
endcap,
pathName,
- id);
+ id);
}
// Create the reflected endcap sensor.
if ( reflectedEndcap != null )
{
- pathName = "/" + cal.getName() + "_negative" + "/" + layerName + "/" + sliceName;
+ String reflectedPathName = "/" + cal.getName() + "_negative" + "/" + layerName + "/" + sliceName;
// Make an id for the endcap south sensor.
if (helper.hasField("system"))
{
- IExpandedIdentifier expidReflect = new ExpandedIdentifier(helper.getIdentifierDictionary().getNumberOfFields());
+ IExpandedIdentifier reflectedExpid = new ExpandedIdentifier(helper.getIdentifierDictionary().getNumberOfFields());
if (helper.hasField("system"))
- expidReflect.setValue(helper.getFieldIndex("system"), cal.getSystemID());
- expidReflect.setValue(helper.getFieldIndex("barrel"), BarrelEndcapFlag.ENDCAP_SOUTH.getFlag());
- expidReflect.setValue(helper.getFieldIndex("layer"), i);
+ reflectedExpid.setValue(helper.getFieldIndex("system"), cal.getSystemID());
+ reflectedExpid.setValue(helper.getFieldIndex("barrel"), BarrelEndcapFlag.ENDCAP_SOUTH.getFlag());
+ reflectedExpid.setValue(helper.getFieldIndex("layer"), i);
if (helper.hasField("slice"))
- expidReflect.setValue(helper.getFieldIndex("slice"), j);
- IIdentifier idReflect = helper.pack(expidReflect);
-
+ reflectedExpid.setValue(helper.getFieldIndex("slice"), j);
+ IIdentifier idReflect = helper.pack(reflectedExpid);
+
new DetectorElement(
cal.getName() + "_negative_layer" + layerNumber + "_sensor" + sensorNumber,
reflectedEndcap,
- pathName,
- idReflect);
- }
- }
+ reflectedPathName,
+ idReflect);
+ }
+ }
+
// Increment the sensor number.
++sensorNumber;
}