Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce ldmx-reduced-v2 #1489

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Introduce ldmx-reduced-v2 #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions DetDescr/python/EcalGeometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()]
2 changes: 1 addition & 1 deletion DetDescr/python/HcalGeometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading