projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java 2014-09-02 05:03:43 UTC (rev 3288)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java 2014-09-02 05:05:09 UTC (rev 3289)
@@ -233,8 +233,13 @@
int sysId = node.getAttribute("id").getIntValue();
physVol.addPhysVolID("system", sysId);
physVol.addPhysVolID("barrel", 0);
+
+ //use the old definition of layer number to be consistent
+ //int layer = HPSTestRunTracker2014Builder.getLayerFromVolumeName(geometryObject.getName());
+ int layer = HPSTestRunTracker2014Builder.getOldGeomDefLayerFromVolumeName(geometryObject.getName());
+ if(_debug) System.out.printf("%s: physVolId layer = %d (compare with new layer %d)\n", getClass().getSimpleName(),layer, HPSTestRunTracker2014Builder.getLayerFromVolumeName(geometryObject.getName()));
+
- int layer = HPSTestRunTracker2014Builder.getLayerFromVolumeName(geometryObject.getName());
geometryObject.getPhysVolume().addPhysVolID("layer", layer);
String half = HPSTestRunTracker2014Builder.getHalfFromName(geometryObject.getName());
if(half.equals("")) throw new RuntimeException("no half was found for name " + geometryObject.getName());
@@ -242,7 +247,7 @@
geometryObject.getPhysVolume().addPhysVolID("module", moduleId);
}
- //TODO is this really needed?
+ //TODO this is always 0 in old geometry? Is the id0 really needed?
else if(name.endsWith("sensor_active")) {
geometryObject.getPhysVolume().addPhysVolID("sensor", 0);
}
@@ -251,10 +256,10 @@
geometryObject.getPhysVolume().addPhysVolID("component", 0);
}
else if(name.endsWith("lamination")) {
- geometryObject.getPhysVolume().addPhysVolID("component", 1);
+ geometryObject.getPhysVolume().addPhysVolID("component", 2);
}
else if(name.endsWith("cf")) {
- geometryObject.getPhysVolume().addPhysVolID("component", 2);
+ geometryObject.getPhysVolume().addPhysVolID("component", 1);
}
else if(name.endsWith("hybrid")) {
geometryObject.getPhysVolume().addPhysVolID("component", 3);