Added the new reduced ldmx v2 geometry, modified the layer positions …

…in EcalGeometry.py, and modified the layer weights in digi.py Update digi.py Update digi.py
LDMX-Software · Oct 17, 2024 · 73aa362 · 73aa362
1 parent 34d43a5
commit 73aa362
Show file tree

Hide file tree

Showing 16 changed files with 5,467 additions and 4 deletions.
diff --git a/DetDescr/python/EcalGeometry.py b/DetDescr/python/EcalGeometry.py
@@ -124,9 +124,8 @@ def v14() :
         eg.layer_shift_x = 2*eg.moduleMinR / eg.nCellRHeight
         return eg
 
-
     def reduced() :
-        eg = EcalGeometry(detectors_valid = ["ldmx-reduced","ldmx-reduced[.].*"],
+        eg = EcalGeometry(detectors_valid = ["ldmx-reduced"],
                 gap = 1.5,
                 layerZPositions = [
                       7.932, 14.532, 32.146, 40.746, 58.110, 67.710
@@ -139,5 +138,19 @@ def reduced() :
         eg.layer_shift_x = 2*eg.moduleMinR / eg.nCellRHeight
         return eg
 
+    def reduced_v2() :
+        eg = EcalGeometry(detectors_valid = ["ldmx-reduced-v2"],
+                gap = 1.5,
+                layerZPositions = [
+                      9.932, 22.412, 40.81, 54.556, 71.954, 85.67
+                      ],
+                ecalFrontZ = 240.0,
+                cornersSideUp = True,
+                layer_shift_odd = True,
+                )
+        # shift by a single cell diameter
+        eg.layer_shift_x = 2*eg.moduleMinR / eg.nCellRHeight
+        return eg
+
     def geometries() :
-        return [EcalGeometry.v9(), EcalGeometry.v12(), EcalGeometry.v13(), EcalGeometry.v14(), EcalGeometry.reduced()]
+        return [EcalGeometry.v9(), EcalGeometry.v12(), EcalGeometry.v13(), EcalGeometry.v14(), EcalGeometry.reduced(), EcalGeometry.reduced_v2()]
diff --git a/DetDescr/python/HcalGeometry.py b/DetDescr/python/HcalGeometry.py
@@ -487,5 +487,5 @@ def make_v14(self):
         ]
         # added the reduced geometry temporarily, for the final geometry
         # we should have a new function "reduced()" with the prototype geom
-        self.v14.detectors_valid = ["ldmx-det-v14", "ldmx-det-v14.*", "ldmx-reduced","ldmx-lyso-r1-v14", "ldmx-lyso-r1-v14.*"]
+        self.v14.detectors_valid = ["ldmx-det-v14", "ldmx-det-v14.*", "ldmx-reduced", "ldmx-reduced-v2","ldmx-lyso-r1-v14", "ldmx-lyso-r1-v14.*"]
         self.v14.y_offset = 19.05