-
Notifications
You must be signed in to change notification settings - Fork 56
LFHCAL TB geom #881
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.
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
Draft
veprbl
wants to merge
21
commits into
main
Choose a base branch
from
pr/lfhcal_8m_module_only
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,324
−84
Draft
LFHCAL TB geom #881
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
13a15c6
LFHCAL Single 8M Module geometry
66fa8dd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] fa26395
remove duplicate constant definitions
veprbl 8d0e516
remove duplicate constant definitions (part 2)
veprbl 1301673
updated TB geoms
FriederikeBock 5047a34
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] d80be11
fixed file names
FriederikeBock 2a2cf76
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] e3e7206
tb geom attempt
FriederikeBock 5c90500
modified TB setup
FriederikeBock dcbfab3
updated labeling for configs
FriederikeBock c908b5d
update tb geom
FriederikeBock 21f3673
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] bc848f9
added in debug couts
FriederikeBock 62ce406
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 6a2c5b9
updated geom
FriederikeBock 41924d8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 5d05bc3
updated geom
FriederikeBock 5b5fb7d
updated configuration for 2026 with both summing options
FriederikeBock c5d2e93
updated geom with more docu
FriederikeBock aed4232
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ build/* | |
| */*.pyc | ||
| **.pyc | ||
|
|
||
| install/ | ||
| lib/ | ||
| share/ | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <lccdd> | ||
| <define> | ||
| <documentation> | ||
| #### Material Thickness | ||
| </documentation> | ||
| <constant name="LFHCALAbsorberThickness" value="1.52* cm"/> | ||
| <constant name="LFHCALPolystyreneThickness" value="0.4* cm"/> | ||
| <constant name="LFHCALKaptonThickness" value="0.08* cm"/> | ||
| <constant name="LFHCALAirOffset" value="0.05* cm"/> | ||
| <constant name="LFHCALElectronicsThickness" value="10.0* cm"/> | ||
| <documentation> | ||
| - Hcal Endcap N Layers and computed Thickness | ||
| </documentation> | ||
|
|
||
| <comment> FIXME: Need actual values once they are decided upon </comment> | ||
| <constant name="LFHCALLayer_NSteelRepeatSFirst" value="5"/> <!-- 6 x 10 steel layers --> | ||
| <constant name="LFHCALLayer_NSteelRepeatS" value="10"/> <!-- 6 x 10 steel layers --> | ||
| <constant name="LFHCALLayer_NTungstenRepeat" value="0"/> | ||
| <constant name="Mod_MountingPlateThickness" value="25.4* mm"/> | ||
| <constant name="Mod_SideWallThickness" value="1.9* mm"/> | ||
| <constant name="Mod_TopWallThickness" value="1.9* mm"/> | ||
| <constant name="Mod_FrontWallThickness" value="15* mm"/> | ||
| <constant name="Mod_BackWallThickness" value="15* mm"/> | ||
| <constant name="Mod_NotchDepth" value="5* mm"/> | ||
| <constant name="Mod_NotchHeight" value="78* mm"/> | ||
| <constant name="Mod_FoilThick" value="0.1* mm"/> | ||
| <constant name="Mod_PCBWidth" value="70* mm"/> | ||
| <constant name="Mod_PCBThickness" value="4* mm"/> | ||
| <constant name="Mod_PCBLength" value="125* cm"/> | ||
|
|
||
|
|
||
| <constant name="EightM_xArr" value="4" /> | ||
| <constant name="EightM_yArr" value="2" /> | ||
| <constant name="EightM_OuterWidth" value="20.188* cm"/> | ||
| <constant name="EightM_OuterHeight" value="10.1* cm"/> | ||
| <constant name="EightM_BackInnerWidth" value="15.0* cm"/> | ||
| <constant name="EightM_BackInnerHeight" value="7.0* cm"/> | ||
| <constant name="FourM_xArr" value="2" /> | ||
| <constant name="FourM_yArr" value="2" /> | ||
| <constant name="FourM_OuterWidth" value="10.094* cm"/> | ||
| <constant name="FourM_OuterHeight" value="10.1* cm"/> | ||
| <constant name="FourM_BackInnerWidth" value="7.0* cm"/> | ||
| <constant name="FourM_BackInnerHeight" value="7.0* cm"/> | ||
| <constant name="FourM_NotchHeight" value="75* mm"/> | ||
|
|
||
| </define> | ||
|
|
||
| </lccdd> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| <lccdd> | ||
|
|
||
| <info name="lfhcal_2024_TB.xml" | ||
| title="EPIC LFHCAL single 8M Module (long), configuration as TB at PS in 2024" | ||
| author="@FriederikeBock" | ||
| url="https://github.com/FriederikeBock" | ||
| status="development" | ||
| version="1.0" | ||
| ><comment/></info> | ||
|
|
||
| <define> | ||
| <include ref="lfhcal/module_definitions.xml"/> | ||
| <constant name="Mod_MountingPlateThickness" value="0* mm"/> | ||
| <constant name="Mod_PCBLength" value="135* cm"/> | ||
|
|
||
| </define> | ||
|
|
||
| <display> | ||
| <vis name="LFHCAL8MModVis" ref="AnlBlue" showDaughters="true" visible="true"/> | ||
| <vis name="LFHCAL4MModVis" ref="AnlViolet" showDaughters="true" visible="true"/> | ||
| <vis name="LFHCAL8MModOuter" ref="AnlBlue" showDaughters="true" visible="true"/> | ||
| <vis name="LFHCALLayerScintVis" ref="AnlLightGray" showDaughters="false" visible="true"/> | ||
| <vis name="LFHCALLayerSteelVis" ref="AnlRed" showDaughters="false" visible="true"/> | ||
| <vis name="LFHCALLayerTungstenVis" ref="AnlViolet" showDaughters="false" visible="true"/> | ||
| <vis name="LFHCALLayerKaptonVis" ref="AnlGold" showDaughters="false" visible="true"/> | ||
| <vis name="LFHCALLayerFoilVis" ref="AnlGray" showDaughters="false" visible="true"/> | ||
| <vis name="LFHCALModPCB" ref="AnlDarkGreen" showDaughters="false" visible="true"/> | ||
| </display> | ||
|
|
||
| <!-- Define detector --> | ||
| <detectors> | ||
| <documentation> | ||
| ### Forward (Positive Z) Endcap Hadronic Calorimeter | ||
|
|
||
| This is the ECCE LFHCAL design without individual tower placements and electronics | ||
| As deployed during thestbeam in 2024 | ||
| The HCal forward insert shape is cut out from this detector | ||
|
|
||
| So then, actual detector area is "LFHCAL_length - LFHCALElectronicsThickness" long | ||
| </documentation> | ||
| <detector | ||
| id="LFHCAL_ID" | ||
| name="LFHCAL" | ||
| type="epic_LFHCAL_TestBeam" | ||
| readout="LFHCALHits" | ||
| vis="InvisibleWithDaughters" | ||
| calorimeterType="HAD_ENDCAP" | ||
| renderComponents="1" | ||
| allSensitive="0" | ||
| > | ||
|
|
||
| <position x="0" y="0" z="0"/> | ||
| <dimensions | ||
| z="140*cm" | ||
| rmin="20*cm" | ||
| rmax="LFHCAL_rmax" | ||
| x="EightM_OuterWidth" | ||
| y="EightM_OuterHeight" | ||
| x0="-FourM_OuterWidth"/> | ||
| <envelope material="Steel235"/> | ||
|
|
||
| <eightmodule name="8MModule" vis="InvisibleWithDaughters" repeat="0" > | ||
| <dimensions | ||
| width="EightM_OuterWidth" | ||
| height="EightM_OuterHeight" | ||
| widthBackInner="EightM_BackInnerWidth" | ||
| heightBackInner="EightM_BackInnerHeight" | ||
| widthSideWall="Mod_SideWallThickness" | ||
| widthTopWall="Mod_TopWallThickness" | ||
| thicknessMountingPlate="Mod_MountingPlateThickness" | ||
| thicknessFrontWall="Mod_FrontWallThickness" | ||
| thicknessBackWall="Mod_BackWallThickness" | ||
| arrayX="EightM_xArr" | ||
| arrayY="EightM_yArr" | ||
| notchDepth="Mod_NotchDepth" | ||
| notchHeight="Mod_NotchHeight" | ||
| foilThick="Mod_FoilThick" | ||
| pcbLength="Mod_PCBLength" | ||
| pcbThick="Mod_PCBThickness" | ||
| pcbWidth="Mod_PCBWidth" | ||
| /> | ||
| <position x="50*cm" y="50*cm" z="140*cm - LFHCALElectronicsThickness" /> | ||
| </eightmodule> | ||
| <layer repeat="LFHCALLayer_NSteelRepeatSFirst" vis="InvisibleWithDaughters" readoutlayer="0"> | ||
| <slice material="Steel235" thickness="LFHCALAbsorberThickness" vis="LFHCALLayerSteelVis" type="1"/> | ||
| <slice material="Kapton" thickness="LFHCALKaptonThickness" vis="LFHCALLayerKaptonVis" type="2" offset="LFHCALAirOffset"/> | ||
| <slice material="Polystyrene" thickness="LFHCALPolystyreneThickness" vis="LFHCALLayerScintVis" sensitive="yes" limits="cal_limits" type="3" /> | ||
| </layer> | ||
| <layer repeat="LFHCALLayer_NSteelRepeatSFirst" vis="InvisibleWithDaughters" readoutlayer="1"> | ||
| <slice material="Steel235" thickness="LFHCALAbsorberThickness" vis="LFHCALLayerSteelVis" type="1"/> | ||
| <slice material="Kapton" thickness="LFHCALKaptonThickness" vis="LFHCALLayerKaptonVis" type="2" offset="LFHCALAirOffset"/> | ||
| <slice material="Polystyrene" thickness="LFHCALPolystyreneThickness" vis="LFHCALLayerScintVis" sensitive="yes" limits="cal_limits" type="3" /> | ||
| </layer> | ||
| <layer repeat="LFHCALLayer_NSteelRepeatS" vis="InvisibleWithDaughters" readoutlayer="2"> | ||
| <slice material="Steel235" thickness="LFHCALAbsorberThickness" vis="LFHCALLayerSteelVis" type="1"/> | ||
| <slice material="Kapton" thickness="LFHCALKaptonThickness" vis="LFHCALLayerKaptonVis" type="2" offset="LFHCALAirOffset"/> | ||
| <slice material="Polystyrene" thickness="LFHCALPolystyreneThickness" vis="LFHCALLayerScintVis" sensitive="yes" limits="cal_limits" type="3" /> | ||
| </layer> | ||
| <layer repeat="LFHCALLayer_NSteelRepeatS" vis="InvisibleWithDaughters" readoutlayer="3"> | ||
| <slice material="Steel235" thickness="LFHCALAbsorberThickness" vis="LFHCALLayerSteelVis" type="1"/> | ||
| <slice material="Kapton" thickness="LFHCALKaptonThickness" vis="LFHCALLayerKaptonVis" type="2" offset="LFHCALAirOffset"/> | ||
| <slice material="Polystyrene" thickness="LFHCALPolystyreneThickness" vis="LFHCALLayerScintVis" sensitive="yes" limits="cal_limits" type="3" /> | ||
| </layer> | ||
| <layer repeat="LFHCALLayer_NSteelRepeatS" vis="InvisibleWithDaughters" readoutlayer="4"> | ||
| <slice material="Steel235" thickness="LFHCALAbsorberThickness" vis="LFHCALLayerSteelVis" type="1"/> | ||
| <slice material="Kapton" thickness="LFHCALKaptonThickness" vis="LFHCALLayerKaptonVis" type="2" offset="LFHCALAirOffset"/> | ||
| <slice material="Polystyrene" thickness="LFHCALPolystyreneThickness" vis="LFHCALLayerScintVis" sensitive="yes" limits="cal_limits" type="3" /> | ||
| </layer> | ||
| <layer repeat="LFHCALLayer_NSteelRepeatS" vis="InvisibleWithDaughters" readoutlayer="5"> | ||
| <slice material="Steel235" thickness="LFHCALAbsorberThickness" vis="LFHCALLayerSteelVis" type="1"/> | ||
| <slice material="Kapton" thickness="LFHCALKaptonThickness" vis="LFHCALLayerKaptonVis" type="2" offset="LFHCALAirOffset"/> | ||
| <slice material="Polystyrene" thickness="LFHCALPolystyreneThickness" vis="LFHCALLayerScintVis" sensitive="yes" limits="cal_limits" type="3" /> | ||
| </layer> | ||
| <layer repeat="LFHCALLayer_NSteelRepeatSFirst" vis="InvisibleWithDaughters" readoutlayer="6"> | ||
| <slice material="Steel235" thickness="LFHCALAbsorberThickness" vis="LFHCALLayerSteelVis" type="1"/> | ||
| <slice material="Kapton" thickness="LFHCALKaptonThickness" vis="LFHCALLayerKaptonVis" type="2" offset="LFHCALAirOffset"/> | ||
| <slice material="Polystyrene" thickness="LFHCALPolystyreneThickness" vis="LFHCALLayerScintVis" sensitive="yes" limits="cal_limits" type="3" /> | ||
| </layer> | ||
| <layer repeat="LFHCALLayer_NSteelRepeatSFirst" vis="InvisibleWithDaughters" readoutlayer="7"> | ||
| <slice material="Steel235" thickness="LFHCALAbsorberThickness" vis="LFHCALLayerSteelVis" type="1"/> | ||
| <slice material="Kapton" thickness="LFHCALKaptonThickness" vis="LFHCALLayerKaptonVis" type="2" offset="LFHCALAirOffset"/> | ||
| <slice material="Polystyrene" thickness="LFHCALPolystyreneThickness" vis="LFHCALLayerScintVis" sensitive="yes" limits="cal_limits" type="3" /> | ||
| </layer> | ||
| <layer repeat="LFHCALLayer_NSteelRepeatSFirst" vis="InvisibleWithDaughters" readoutlayer="8"> | ||
| <slice material="Steel235" thickness="LFHCALAbsorberThickness" vis="LFHCALLayerSteelVis" type="1"/> | ||
| <slice material="Kapton" thickness="LFHCALKaptonThickness" vis="LFHCALLayerKaptonVis" type="2" offset="LFHCALAirOffset"/> | ||
| <slice material="Polystyrene" thickness="LFHCALPolystyreneThickness" vis="LFHCALLayerScintVis" sensitive="yes" limits="cal_limits" type="3" /> | ||
| </layer> | ||
|
|
||
| <documentation> | ||
| ### for testing of a single module | ||
| </documentation> | ||
| <eightmodulepositions> | ||
| <position x="0*mm" y="0*mm" z="0*mm" orientation="1" IDx="0" IDy="0"/> | ||
| </eightmodulepositions> | ||
|
|
||
|
|
||
| <documentation> | ||
| ### positions of modules for full area LFHCAL (sorted by ascending r, x, y) | ||
| </documentation> | ||
| <fourmodulepositions> | ||
| </fourmodulepositions> | ||
|
|
||
| </detector> | ||
|
|
||
| </detectors> | ||
|
|
||
| <!-- Definition of the readout segmentation/definition --> | ||
| <readouts> | ||
| <readout name="LFHCALHits"> | ||
| <documentation> | ||
| Explanation of CellIDs total 64 bits | ||
| first 8 bits system ID: 116 for LFHCal | ||
| followed by: | ||
| 4 bits [0-15] ModuleID X | ||
| 4 bits [0-15] ModuleID Y | ||
| 1 bit [0-1] Module type 0 - 8M , 1 - 4M | ||
| 2 bit [0-3] tower X | ||
| 1 bit [0-1] tower Y | ||
| 6 bit [0-63] readout layer z | ||
| 6 bit [0-63] layer z in readout layer | ||
| </documentation> | ||
| <segmentation type="NoSegmentation"/> | ||
| <id>system:8,moduleIDx:4,moduleIDy:4,moduletype:1,passive:1,towerx:2,towery:1,rlayerz:6,layerz:6</id> | ||
| </readout> | ||
| </readouts> | ||
|
|
||
| </lccdd> | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This produces a new warning:
(happens to be what confuses the convert-to-step on CI)
We need to move those two out from module_definitions.xml to lfhcal.xml (and keep in lfhcal_2024_TB and lfhcal_2025_TB, of course).