GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.12 -r1.13
--- CylindricalBarrelCalorimeterConverter.java 20 Nov 2008 18:34:57 -0000 1.12
+++ CylindricalBarrelCalorimeterConverter.java 18 Mar 2009 03:09:57 -0000 1.13
@@ -88,8 +88,8 @@
String name = cal.getName();
double zHalfLength = cal.getZMax();
-
- int sensorNumber = 0;
+
+ int layerNumber = 0;
for (int i=0; i<layering.getNumberOfLayers(); i++)
{
@@ -121,6 +121,7 @@
double sliceInnerRadius = layerInnerRadius;
+ int sensorNumber = 0;
for (int j=0; j<layer.getSlices().size(); j++)
{
LayerSlice slice = layer.getSlice(j);
@@ -152,13 +153,14 @@
j);
// Setup a DE for each sensitive slice.
+ // TODO: needs identifier
if ( slice.isSensitive() )
{
// Path to the PhysicalVolume of this sensor.
String sensorPath = "/" + cal.getName() + "/" + layerName + "/" + sliceName;
new DetectorElement(
- cal.getName() + "_sensor" + sensorNumber,
+ cal.getName() + "_layer" + layerNumber + "_sensor" + sensorNumber,
cal.getDetectorElement(),
sensorPath);
@@ -167,7 +169,9 @@
}
sliceInnerRadius += sliceThickness;
- }
+ }
+ // Increment layer number..
+ layerNumber += 1;
}
}
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.15 -r1.16
--- CylindricalEndcapCalorimeterConverter.java 18 Mar 2009 02:54:35 -0000 1.15
+++ CylindricalEndcapCalorimeterConverter.java 18 Mar 2009 03:09:57 -0000 1.16
@@ -94,36 +94,39 @@
{
Layer layer = cal.getLayering().getLayer(i);
String layerName = "layer" + i;
+ int sensorNumber=0;
for (int j=0; j<layer.getSlices().size(); j++)
{
String sliceName = "slice" + j;
LayerSlice slice = layer.getSlice(j);
+ // TODO: need identifiers
if ( slice.isSensitive() )
{
- // Create an endcap layer.
+ // Create an endcap sensor.
String pathName = "/" + cal.getName() + "_positive" + "/" + layerName + "/" + sliceName;
new DetectorElement(
- cal.getName() + "_positive_sensor" + layerNumber,
+ cal.getName() + "_positive_layer" + layerNumber + "_sensor" + sensorNumber,
endcap,
pathName);
//System.out.println("made " + e.getName());
- // Create the reflected endcap layer.
+ // Create the reflected endcap sensor.
if ( reflectedEndcap != null )
{
pathName = "/" + cal.getName() + "_negative" + "/" + layerName + "/" + sliceName;
new DetectorElement(
- cal.getName() + "_negative_sensor" + layerNumber,
+ cal.getName() + "_negative_layer" + layerNumber + "_sensor" + sensorNumber,
reflectedEndcap,
pathName);
//System.out.println("made " + e.getName());
- }
-
-
- // Increment the layer number.
- ++layerNumber;
- }
- }
+ }
+ // Increment the sensor number.
+ ++sensorNumber;
+ }
+ }
+
+ // Increment the layer number.
+ ++layerNumber;
}
}