Merge branch 'main' into rm-generate-weekly-meeting-slides

eic · Feb 6, 2025 · a76bc70 · a76bc70
2 parents d40ff8a + 1e548cb
commit a76bc70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compact/pid/dirc.xml b/compact/pid/dirc.xml
@@ -63,7 +63,7 @@
     <constant name="DIRCBar_height"         value="17 * mm"/>
     <constant name="DIRCBar_width"          value="(DIRCPrism_width - (DIRCBar_count_y - 1) * DIRCBar_gap) / DIRCBar_count_y"/>
     <constant name="DIRCGlue_thickness"     value="0.05 * mm"/>
-    <constant name="DIRCBar_length"         value="(DIRCBarAssm_length - 4 * DIRCGlue_thickness)/4"/>
+    <constant name="DIRCBar_length"         value="(DIRCBarAssm_length - DIRCBar_count_z * DIRCGlue_thickness)/DIRCBar_count_z"/>
     <constant name="DIRCBar_center"         value="(DIRC_rmin + DIRC_rmax)/2" comment="Radial position of center of bar"/>
 
   </define>

diff --git a/src/DIRC_geo.cpp b/src/DIRC_geo.cpp
@@ -88,7 +88,7 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens) {
 
   // Envelope for bars + mirror
   Box Envelope_box("Envelope_box", (mirror_height + 1 * mm) / 2, 5 * (bar_width + 0.15 * mm),
-                   2 * (bar_length + glue_thickness) + 0.5 * mirror_thickness);
+                   0.5 * bar_repeat_z * (bar_length + glue_thickness) + 0.5 * mirror_thickness);
   Volume Envelope_box_vol("Envelope_box_vol", Envelope_box, desc.material("AirOptical"));
   dirc_module.placeVolume(Envelope_box_vol, Position(0, 0, 0.5 * mirror_thickness));