diff --git a/DetDescr/python/EcalGeometry.py b/DetDescr/python/EcalGeometry.py index 5efd7e4cc..589e434f1 100644 --- a/DetDescr/python/EcalGeometry.py +++ b/DetDescr/python/EcalGeometry.py @@ -108,7 +108,7 @@ def v13() : ) def v14() : - eg = EcalGeometry(detectors_valid = ["ldmx-det-v14","ldmx-det-v14[.].*","ldmx-lyso-r1-v14", "ldmx-lyso-r1-v14[.].*"], + eg = EcalGeometry(detectors_valid = ["ldmx-det-v14","ldmx-det-v14.*","ldmx-lyso-r1-v14", "ldmx-lyso-r1-v14.*"], gap = 1.5, layerZPositions = [ 7.932, 14.532, 32.146, 40.746, 58.110, 67.710, 86.574, 96.774, 115.638, 125.838, diff --git a/DetDescr/python/HcalGeometry.py b/DetDescr/python/HcalGeometry.py index fda0ce0b2..59aff9f7d 100644 --- 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-reduced","ldmx-lyso-r1-v14", "ldmx-lyso-r1-v14[.].*"] + self.v14.detectors_valid = ["ldmx-det-v14", "ldmx-det-v14.*", "ldmx-reduced","ldmx-lyso-r1-v14", "ldmx-lyso-r1-v14.*"] self.v14.y_offset = 19.05 diff --git a/Detectors/data/ldmx-det-v14-8gev/detector.gdml b/Detectors/data/ldmx-det-v14-8gev/detector.gdml index 74f9df7c7..c52bb5975 100644 --- a/Detectors/data/ldmx-det-v14-8gev/detector.gdml +++ b/Detectors/data/ldmx-det-v14-8gev/detector.gdml @@ -106,7 +106,7 @@ - +