diff --git a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
index 92bc75013bf4c3503ec78b89a0c3d5fec762a05c..c9e9ff2184345a8e2549f60a401eae1a3289934a 100644
--- a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
@@ -18,168 +18,164 @@ using namespace DD4hep::Geometry;
using namespace DD4hep::DDRec;
static void placeStaves(DetElement& parent, DetElement& stave, double rmin, int numsides, double total_thickness,
- Volume envelopeVolume, double innerAngle, Volume sectVolume) {
- double innerRotation = innerAngle;
- double offsetRotation = -innerRotation / 2;
- double sectCenterRadius = rmin + total_thickness / 2;
- double rotX = M_PI / 2;
- double rotY = -offsetRotation;
- double posX = -sectCenterRadius * std::sin(rotY);
- double posY = sectCenterRadius * std::cos(rotY);
-
- for (int module = 1; module <= numsides; ++module) {
- DetElement det = module > 1 ? stave.clone(_toString(module, "stave%d")) : stave;
- PlacedVolume pv = envelopeVolume.placeVolume(sectVolume,
- Transform3D(RotationZYX(0, rotY, rotX), Translation3D(-posX, -posY, 0)));
- // Not a valid volID: pv.addPhysVolID("stave", 0);
- pv.addPhysVolID("module", module);
- det.setPlacement(pv);
- parent.add(det);
- rotY -= innerRotation;
- posX = -sectCenterRadius * std::sin(rotY);
- posY = sectCenterRadius * std::cos(rotY);
- }
+ Volume envelopeVolume, double innerAngle, Volume sectVolume) {
+ double innerRotation = innerAngle;
+ double offsetRotation = -innerRotation / 2;
+ double sectCenterRadius = rmin + total_thickness / 2;
+ double rotX = M_PI / 2;
+ double rotY = -offsetRotation;
+ double posX = -sectCenterRadius * std::sin(rotY);
+ double posY = sectCenterRadius * std::cos(rotY);
+
+ for (int module = 1; module <= numsides; ++module) {
+ DetElement det = module > 1 ? stave.clone(_toString(module, "stave%d")) : stave;
+ PlacedVolume pv = envelopeVolume.placeVolume(sectVolume,
+ Transform3D(RotationZYX(0, rotY, rotX), Translation3D(-posX, -posY, 0)));
+ // Not a valid volID: pv.addPhysVolID("stave", 0);
+ pv.addPhysVolID("module", module);
+ det.setPlacement(pv);
+ parent.add(det);
+ rotY -= innerRotation;
+ posX = -sectCenterRadius * std::sin(rotY);
+ posY = sectCenterRadius * std::cos(rotY);
+ }
}
static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
- xml_det_t x_det = e;
- Layering layering(x_det);
- xml_comp_t staves = x_det.staves();
- xml_dim_t dim = x_det.dimensions();
- string det_name = x_det.nameStr();
- string det_type = x_det.typeStr();
- Material air = lcdd.air();
- double totalThickness = layering.totalThickness();
- int totalRepeat = 0;
- int totalSlices = 0;
- double gap = xml_dim_t(x_det).gap();
- int numSides = dim.numsides();
- double detZ = dim.z();
- double rmin = dim.rmin();
- DetElement sdet(det_name, x_det.id());
- DetElement stave("stave1", x_det.id());
- Volume motherVol = lcdd.pickMotherVolume(sdet);
-
- for (xml_coll_t c(x_det, _U(layer)); c; ++c) {
- xml_comp_t x_layer = c;
- int repeat = x_layer.repeat();
- totalRepeat += repeat;
- totalSlices += x_layer.numChildren(_U(slice));
- }
-
- PolyhedraRegular polyhedra(numSides, rmin, rmin + totalThickness, detZ);
- Volume envelopeVol(det_name + "_envelope", polyhedra, air);
-
- // Add the subdetector envelope to the structure.
- double innerAngle = 2 * M_PI / numSides;
- double halfInnerAngle = innerAngle / 2;
- double tan_inner = std::tan(halfInnerAngle) * 2;
- double innerFaceLen = rmin * tan_inner;
- double outerFaceLen = (rmin + totalThickness) * tan_inner;
- double staveThickness = totalThickness;
-
- Trapezoid staveTrdOuter(innerFaceLen / 2, outerFaceLen / 2, detZ / 2, detZ / 2, staveThickness / 2);
- Volume staveOuterVol(det_name + "_stave", staveTrdOuter, air);
-
- Trapezoid staveTrdInner(innerFaceLen / 2 - gap, outerFaceLen / 2 - gap, detZ / 2, detZ / 2, staveThickness / 2);
- Volume staveInnerVol(det_name + "_inner", staveTrdInner, air);
-
- double layerOuterAngle = (M_PI - innerAngle) / 2;
- double layerInnerAngle = (M_PI / 2 - layerOuterAngle);
- double layer_pos_z = -(staveThickness / 2);
- double layer_dim_x = innerFaceLen / 2 - gap * 2;
- int layer_num = 1;
-
- LayeringExtensionImpl* layeringExtension = new LayeringExtensionImpl();
- Position layerNormal(0,0,1);
-
- // Set envelope volume attributes.
- envelopeVol.setAttributes(lcdd, x_det.regionStr(), x_det.limitsStr(), x_det.visStr());
-
- for (xml_coll_t c(x_det, _U(layer)); c; ++c) {
- xml_comp_t x_layer = c;
- int repeat = x_layer.repeat(); // Get number of times to repeat this layer.
- const Layer* lay = layering.layer(layer_num - 1); // Get the layer from the layering engine.
- // Loop over repeats for this layer.
- for (int j = 0; j < repeat; j++) {
- string layer_name = det_name + _toString(layer_num, "_layer%d");
- double layer_thickness = lay->thickness();
- DetElement layer(stave, _toString(layer_num, "layer%d"), x_det.id());
- layeringExtension->setLayer(layer_num, layer, layerNormal);
-
- // Layer position in Z within the stave.
- layer_pos_z += layer_thickness / 2;
- // Layer box & volume
- Volume layer_vol(layer_name, Box(layer_dim_x, detZ / 2, layer_thickness / 2), air);
-
- // Create the slices (sublayers) within the layer.
- double slice_pos_z = -(layer_thickness / 2);
- int slice_number = 1;
- for (xml_coll_t k(x_layer, _U(slice)); k; ++k) {
- xml_comp_t x_slice = k;
- string slice_name = layer_name + _toString(slice_number, "_slice%d");
- double slice_thickness = x_slice.thickness();
- Material slice_material = lcdd.material(x_slice.materialStr());
- DetElement slice(layer, _toString(slice_number, "slice%d"), x_det.id());
-
- slice_pos_z += slice_thickness / 2;
- // Slice volume & box
- Volume slice_vol(slice_name, Box(layer_dim_x, detZ / 2, slice_thickness / 2), slice_material);
-
- if (x_slice.isSensitive()) {
- sens.setType("calorimeter");
- slice_vol.setSensitiveDetector(sens);
+ xml_det_t x_det = e;
+ Layering layering(x_det);
+ xml_comp_t staves = x_det.staves();
+ xml_dim_t dim = x_det.dimensions();
+ string det_name = x_det.nameStr();
+ string det_type = x_det.typeStr();
+ Material air = lcdd.air();
+ double totalThickness = layering.totalThickness();
+ int totalRepeat = 0;
+ int totalSlices = 0;
+ double gap = xml_dim_t(x_det).gap();
+ int numSides = dim.numsides();
+ double detZ = dim.z();
+ double rmin = dim.rmin();
+ DetElement sdet(det_name, x_det.id());
+ DetElement stave("stave1", x_det.id());
+ Volume motherVol = lcdd.pickMotherVolume(sdet);
+
+ for (xml_coll_t c(x_det, _U(layer)); c; ++c) {
+ xml_comp_t x_layer = c;
+ int repeat = x_layer.repeat();
+ totalRepeat += repeat;
+ totalSlices += x_layer.numChildren(_U(slice));
+ }
+
+ PolyhedraRegular polyhedra(numSides, rmin, rmin + totalThickness, detZ);
+ Volume envelopeVol(det_name + "_envelope", polyhedra, air);
+
+ // Add the subdetector envelope to the structure.
+ double innerAngle = 2 * M_PI / numSides;
+ double halfInnerAngle = innerAngle / 2;
+ double tan_inner = std::tan(halfInnerAngle) * 2;
+ double innerFaceLen = rmin * tan_inner;
+ double outerFaceLen = (rmin + totalThickness) * tan_inner;
+ double staveThickness = totalThickness;
+
+ Trapezoid staveTrdOuter(innerFaceLen / 2, outerFaceLen / 2, detZ / 2, detZ / 2, staveThickness / 2);
+ Volume staveOuterVol(det_name + "_stave", staveTrdOuter, air);
+
+ Trapezoid staveTrdInner(innerFaceLen / 2 - gap, outerFaceLen / 2 - gap, detZ / 2, detZ / 2, staveThickness / 2);
+ Volume staveInnerVol(det_name + "_inner", staveTrdInner, air);
+
+ double layerOuterAngle = (M_PI - innerAngle) / 2;
+ double layerInnerAngle = (M_PI / 2 - layerOuterAngle);
+ double layer_pos_z = -(staveThickness / 2);
+ double layer_dim_x = innerFaceLen / 2 - gap * 2;
+ int layer_num = 1;
+
+ LayeringExtensionImpl* layeringExtension = new LayeringExtensionImpl();
+ Position layerNormal(0,0,1);
+
+ // Set envelope volume attributes.
+ envelopeVol.setAttributes(lcdd, x_det.regionStr(), x_det.limitsStr(), x_det.visStr());
+
+ for (xml_coll_t c(x_det, _U(layer)); c; ++c) {
+ xml_comp_t x_layer = c;
+ int repeat = x_layer.repeat(); // Get number of times to repeat this layer.
+ const Layer* lay = layering.layer(layer_num - 1); // Get the layer from the layering engine.
+ // Loop over repeats for this layer.
+ for (int j = 0; j < repeat; j++) {
+ string layer_name = det_name + _toString(layer_num, "_layer%d");
+ double layer_thickness = lay->thickness();
+ DetElement layer(stave, _toString(layer_num, "layer%d"), x_det.id());
+ layeringExtension->setLayer(layer_num, layer, layerNormal);
+
+ // Layer position in Z within the stave.
+ layer_pos_z += layer_thickness / 2;
+ // Layer box & volume
+ Volume layer_vol(layer_name, Box(layer_dim_x, detZ / 2, layer_thickness / 2), air);
+
+ // Create the slices (sublayers) within the layer.
+ double slice_pos_z = -(layer_thickness / 2);
+ int slice_number = 1;
+ for (xml_coll_t k(x_layer, _U(slice)); k; ++k) {
+ xml_comp_t x_slice = k;
+ string slice_name = layer_name + _toString(slice_number, "_slice%d");
+ double slice_thickness = x_slice.thickness();
+ Material slice_material = lcdd.material(x_slice.materialStr());
+ DetElement slice(layer, _toString(slice_number, "slice%d"), x_det.id());
+
+ slice_pos_z += slice_thickness / 2;
+ // Slice volume & box
+ Volume slice_vol(slice_name, Box(layer_dim_x, detZ / 2, slice_thickness / 2), slice_material);
+
+ if (x_slice.isSensitive()) {
+ sens.setType("calorimeter");
+ slice_vol.setSensitiveDetector(sens);
+ }
+ // Set region, limitset, and vis.
+ slice_vol.setAttributes(lcdd, x_slice.regionStr(), x_slice.limitsStr(), x_slice.visStr());
+ // slice PlacedVolume
+ PlacedVolume slice_phv = layer_vol.placeVolume(slice_vol, Position(0, 0, slice_pos_z));
+ slice_phv.addPhysVolID("slice", slice_number);
+
+ slice.setPlacement(slice_phv);
+ // Increment Z position for next slice.
+ slice_pos_z += slice_thickness / 2;
+ // Increment slice number.
+ ++slice_number;
+ }
+ // Set region, limitset, and vis.
+ layer_vol.setAttributes(lcdd, x_layer.regionStr(), x_layer.limitsStr(), x_layer.visStr());
+
+ // Layer physical volume.
+ PlacedVolume layer_phv = staveInnerVol.placeVolume(layer_vol, Position(0, 0, layer_pos_z));
+ layer_phv.addPhysVolID("layer", layer_num);
+ layer.setPlacement(layer_phv);
+
+ // Increment the layer X dimension.
+ layer_dim_x += layer_thickness * std::tan(layerInnerAngle); // * 2;
+ // Increment the layer Z position.
+ layer_pos_z += layer_thickness / 2;
+ // Increment the layer number.
+ ++layer_num;
+ }
}
- // Set region, limitset, and vis.
- slice_vol.setAttributes(lcdd, x_slice.regionStr(), x_slice.limitsStr(), x_slice.visStr());
- // slice PlacedVolume
- PlacedVolume slice_phv = layer_vol.placeVolume(slice_vol, Position(0, 0, slice_pos_z));
- slice_phv.addPhysVolID("slice", slice_number);
-
- slice.setPlacement(slice_phv);
- // Increment Z position for next slice.
- slice_pos_z += slice_thickness / 2;
- // Increment slice number.
- ++slice_number;
- }
- // Set region, limitset, and vis.
- layer_vol.setAttributes(lcdd, x_layer.regionStr(), x_layer.limitsStr(), x_layer.visStr());
-
- // Layer physical volume.
- PlacedVolume layer_phv = staveInnerVol.placeVolume(layer_vol, Position(0, 0, layer_pos_z));
- layer_phv.addPhysVolID("layer", layer_num);
- layer.setPlacement(layer_phv);
-
- // Increment the layer X dimension.
- layer_dim_x += layer_thickness * std::tan(layerInnerAngle); // * 2;
- // Increment the layer Z position.
- layer_pos_z += layer_thickness / 2;
- // Increment the layer number.
- ++layer_num;
- }
- }
-
- // Add stave inner physical volume to outer stave volume.
- staveOuterVol.placeVolume(staveInnerVol);
- // Set the vis attributes of the outer stave section.
- stave.setVisAttributes(lcdd, staves.visStr(), staveOuterVol);
- // Place the staves.
- placeStaves(sdet, stave, rmin, numSides, totalThickness, envelopeVol, innerAngle, staveOuterVol);
-
- double z_offset = dim.hasAttr(_U(z_offset)) ? dim.z_offset() : 0.0;
- Transform3D transform(RotationZ(M_PI / numSides), Translation3D(0, 0, z_offset));
- PlacedVolume env_phv = motherVol.placeVolume(envelopeVol, transform);
- env_phv.addPhysVolID("system", sdet.id());
- env_phv.addPhysVolID("barrel", 0);
- sdet.setPlacement(env_phv);
-
- SubdetectorExtensionImpl* subdetExt = new SubdetectorExtensionImpl(sdet);
- subdetExt->setIsBarrel(true);
-
- sdet.addExtension<SubdetectorExtension>(subdetExt);
- sdet.addExtension<LayeringExtension>(layeringExtension);
- return sdet;
+
+ // Add stave inner physical volume to outer stave volume.
+ staveOuterVol.placeVolume(staveInnerVol);
+ // Set the vis attributes of the outer stave section.
+ stave.setVisAttributes(lcdd, staves.visStr(), staveOuterVol);
+ // Place the staves.
+ placeStaves(sdet, stave, rmin, numSides, totalThickness, envelopeVol, innerAngle, staveOuterVol);
+
+ double z_offset = dim.hasAttr(_U(z_offset)) ? dim.z_offset() : 0.0;
+ Transform3D transform(RotationZ(M_PI / numSides), Translation3D(0, 0, z_offset));
+ PlacedVolume env_phv = motherVol.placeVolume(envelopeVol, transform);
+ env_phv.addPhysVolID("system", sdet.id());
+ env_phv.addPhysVolID("barrel", 0);
+ sdet.setPlacement(env_phv);
+
+ sdet.addExtension<SubdetectorExtension>(new SubdetectorExtensionImpl(sdet));
+ sdet.addExtension<LayeringExtension>(layeringExtension);
+ return sdet;
}
-DECLARE_DETELEMENT(DD4hep_PolyhedraBarrelCalorimeter2,create_detector)
-DECLARE_DEPRECATED_DETELEMENT(PolyhedraBarrelCalorimeter2,create_detector)
+DECLARE_DETELEMENT(PolyhedraBarrelCalorimeter2, create_detector)