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

fix: rename LFHCAL to HcalEndcapP in outward interface (geometry, collections) #649

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

fix: rename LFHCAL to HcalEndcapP in outward interface (geometry, collections) #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b8c53a
fix: rename LFHCAL to HcalEndcapP in outward interface (geometry, col…
wdconinc Feb 29, 2024
3bd9ae6
fix: backwards compatibility by maintaining LFHCALHits
wdconinc Feb 29, 2024
2f578d3
fix: revert some renames, external interface as HcalEndcapP only
wdconinc Mar 27, 2024
4b5f7e5
fix: revert some more renames
wdconinc Mar 27, 2024
c60a88b
fix: alignment
wdconinc Mar 28, 2024
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
15 changes: 7 additions & 8 deletions compact/definitions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ The unused IDs below are saved for future use.
<constant name="PassiveSteelRingEndcapP_ID" value="114"/>
<constant name="HCalEndcapPInsert_ID" value="115"/><!-- DEPRECATED -->
<constant name="HcalEndcapPInsert_ID" value="115"/>
<constant name="LFHCAL_ID" value="116"/>
<constant name="HcalEndcapP_ID" value="116"/>
<documentation>
#### (120-129) (near) Forward reserved

Expand Down Expand Up @@ -587,10 +587,10 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc

<constant name="HcalBarrelStavesN" value="12"/>

<constant name="LFHCAL_zmin" value="EcalEndcapP_zmin + EcalEndcapP_length"/>
<comment> LFHCAL is 140 cm total, but current implementation leaves the final 10 cm empty </comment>
<constant name="LFHCAL_length" value="140.0*cm"/>
<constant name="LFHCAL_zmax" value="LFHCAL_zmin + LFHCAL_length"/>
<constant name="HcalEndcapP_zmin" value="EcalEndcapP_zmin + EcalEndcapP_length"/>
<comment> HcalEndcapP is 140 cm total, but current implementation leaves the final 10 cm empty </comment>
<constant name="HcalEndcapP_length" value="140.0*cm"/>
<constant name="HcalEndcapP_zmax" value="HcalEndcapP_zmin + HcalEndcapP_length"/>

<constant name="HcalEndcapPInsert_zmin" value="EcalEndcapP_zmin + EcalEndcapP_length"/>
<constant name="HcalEndcapPInsert_length" value="134.75*cm"/>
Expand Down Expand Up @@ -628,9 +628,8 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
<constant name="HcalBarrel_length1" value="319.0*cm"/>
<constant name="HcalBarrel_offset" value="(HcalBarrelForward_zmax - HcalBarrelBackward_zmax)/2"/>

<constant name="HcalEndcapN_rmax" value="min(HcalBarrel_rmax, 267.0 * cm)"/>

<constant name="LFHCAL_rmax" value="HcalBarrel_rmax"/>
<constant name="HcalEndcapN_rmax" value="min(HcalBarrel_rmax, 267.0 * cm)"/>
<constant name="HcalEndcapP_rmax" value="HcalBarrel_rmax"/>

<constant name="FluxEndcapN_collar_rmax" value="326.2*cm"/>
<constant name="FluxEndcapN_collar_rmin" value="269.0*cm"/>
Expand Down
4 changes: 2 additions & 2 deletions compact/display.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
<vis name="HcalSensorVis" ref="AnlBlue" showDaughters="false" visible="false"/>
<vis name="HcalAbsorberVis" ref="AnlGray" showDaughters="false" visible="false"/>
<vis name="HcalEndcapInsertVis" ref="AnlGray" showDaughters="false" visible="true"/>
<vis name="LFHCALVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="FluxEndcapNVis" ref="AnlGray" showDaughters="true" visible="false"/>
<vis name="HcalEndcapPVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="FluxEndcapNVis" ref="AnlGray" showDaughters="true" visible="false"/>
<vis name="FluxEndcapNLayerVis" ref="AnlViolet" showDaughters="false" visible="true"/>
<comment>
Passive steel for flux return
Expand Down
2 changes: 1 addition & 1 deletion compact/display_detailed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<vis name="HcalSensorVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="HcalAbsorberVis" ref="AnlGray" showDaughters="true" visible="true"/>
<vis name="HcalEndcapInsertVis" ref="AnlGray" showDaughters="true" visible="true"/>
<vis name="LFHCALVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="HcalEndcapPVis" ref="AnlBlue" showDaughters="true" visible="true"/>

<comment>
Passive steel for flux return
Expand Down
2 changes: 1 addition & 1 deletion compact/display_geoviewer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<vis name="HcalBarrelStaveVis" ref="AnlBlue" showDaughters="false" visible="true"/>
<vis name="HcalBarrelLayerVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="HcalEndcapVis" ref="AnlBlue" showDaughters="false" visible="true"/>
<vis name="LFHCALVis" ref="AnlRed" showDaughters="true" visible="true"/>
<vis name="HcalEndcapPVis" ref="AnlRed" showDaughters="true" visible="true"/>
<vis name="HcalEndcapLayerVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="HcalSensorVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="HcalAbsorberVis" ref="AnlGray" showDaughters="true" visible="true"/>
Expand Down
10 changes: 5 additions & 5 deletions compact/hcal/backward.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
#### Material Thickness
</documentation>
<constant name="HcalEndcapNSteelThickness" value="4.0 * cm"/>
<constant name="HcalEndcapNPolystyreneThickness" value="0.4 * cm"/>
<constant name="HcalEndcapNLayerGap" value="0.1 * cm"/> <!-- 2*thicker than LFHCAL -->
<constant name="HcalEndcapNPolystyreneThickness" value="0.4 * cm"/>
<constant name="HcalEndcapNLayerGap" value="0.1 * cm"/> <!-- 2*thicker than HcalEndcapP -->

<constant name="HcalEndcapN_polyhedron_rmax" value="251.444*cm"/>
<constant name="HcalEndcapN_segments_rmin" value="19.9431*cm"/>
<constant name="HcalEndcapN_segments_rmax" value="HcalEndcapN_rmax/(cos(180*deg/HcalEndcapN_CaloSides))"/>
<constant name="HcalEndcapN_polyhedron_rmax" value="251.444*cm"/>
<constant name="HcalEndcapN_segments_rmin" value="19.9431*cm"/>
<constant name="HcalEndcapN_segments_rmax" value="HcalEndcapN_rmax/(cos(180*deg/HcalEndcapN_CaloSides))"/>


<documentation>
Expand Down
22 changes: 13 additions & 9 deletions compact/hcal/lfhcal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,24 @@
The HCal forward insert shape is cut out from this detector

Currently don't have an implementation of electronics, so just leave that area (final 10 cm) empty
So then, actual detector area is "LFHCAL_length - LFHCALElectronicsThickness" long
So then, actual detector area is "HcalEndcapP_length - LFHCALElectronicsThickness" long
</documentation>
<detector
id="LFHCAL_ID"
name="LFHCAL"
id="HcalEndcapP_ID"
name="HcalEndcapP"
type="epic_LFHCAL"
readout="LFHCALHits"
readout="HcalEndcapPHits"
vis="InvisibleWithDaughters"
calorimeterType="HAD_ENDCAP"
renderComponents="0"
allSensitive="0"
>

<position x="0" y="0" z="LFHCAL_zmin"/>
<position x="0" y="0" z="HcalEndcapP_zmin"/>
<dimensions
z="LFHCAL_length"
z="HcalEndcapP_length"
rmin="20*cm"
rmax="LFHCAL_rmax"/>
rmax="HcalEndcapP_rmax"/>
<eightmodule name="8MModule" vis= "LFHCAL8MModVis" repeat="0" >
<dimensions
width="EightM_OuterWidth"
Expand All @@ -114,7 +114,7 @@
pcbThick="Mod_PCBThickness"
pcbWidth="Mod_PCBWidth"
/>
<position x="50*cm" y="50*cm" z="LFHCAL_length - LFHCALElectronicsThickness" />
<position x="50*cm" y="50*cm" z="HcalEndcapP_length - LFHCALElectronicsThickness" />
</eightmodule>
<fourmodule name="4MModule" vis= "LFHCAL4MModVis" repeat="2">
<dimensions
Expand All @@ -135,7 +135,7 @@
pcbThick="Mod_PCBThickness"
pcbWidth="Mod_PCBWidth"
/>
<position x="50*cm" y="60*cm" z="LFHCAL_length - LFHCALElectronicsThickness" />
<position x="50*cm" y="60*cm" z="HcalEndcapP_length - LFHCALElectronicsThickness" />
</fourmodule>

<layer repeat="1" vis="InvisibleWithDaughters" readoutlayer="0">
Expand Down Expand Up @@ -1377,6 +1377,10 @@
<segmentation type="NoSegmentation"/>
<id>system:8,moduleIDx:6,moduleIDy:6,moduletype:1,passive:1,towerx:2,towery:1,rlayerz:4,layerz:4</id>
</readout>
<readout name="HcalEndcapPHits">
<segmentation type="NoSegmentation"/>
<id>system:8,moduleIDx:6,moduleIDy:6,moduletype:1,passive:1,towerx:2,towery:1,rlayerz:4,layerz:4</id>
</readout>
</readouts>

</lccdd>
2 changes: 1 addition & 1 deletion templates/DetectorParameterTable.csv.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Region,Component,Sub-Component,Length (cm),Inner Radius (cm),Outer Radius (cm),Offset from Center (cm),Physical Start (cm),Physical End (cm)
HADRON DIRECTION END CAP,HD Flux Return (Collar),,,,,,,
HADRON DIRECTION END CAP,Hadron Calorimeter,,{{LFHCAL_length}},0,{{LFHCAL_rmax}},,{{LFHCAL_zmin}},{{LFHCAL_zmax}}
HADRON DIRECTION END CAP,Hadron Calorimeter,,{{HcalEndcapP_length}},0,{{HcalEndcapP_rmax}},,{{HcalEndcapP_zmin}},{{HcalEndcapP_zmax}}
HADRON DIRECTION END CAP,HD Flux Return (Oculus),,,,,,,
HADRON DIRECTION END CAP,Electromagnetic Calorimeter,,{{EcalEndcapP_length}},{{EcalEndcapP_rmin}},{{EcalEndcapP_rmax}},,{{EcalEndcapP_zmin}},{{EcalEndcapP_zmax}}
HADRON DIRECTION END CAP,Service Gap,,{{ForwardServiceGap_length}},,,,{{ForwardServiceGap_zmin}},{{ForwardServiceGap_zmax}}
Expand Down
Loading