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

definitions.xml: ECal -> Ecal, HCal -> Hcal for ID fields #631

Merged
merged 2 commits into from
Feb 12, 2024
Merged

definitions.xml: ECal -> Ecal, HCal -> Hcal for ID fields #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae22a0d
definitions.xml: ECal -> Ecal, HCal -> Hcal for ID fields
veprbl Feb 9, 2024
c6f3a50
Update compact/definitions.xml
veprbl Feb 12, 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
35 changes: 21 additions & 14 deletions compact/definitions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ The unused IDs below are saved for future use.
<documentation>
#### (100-109) Electromagnetic Calorimeter

ECal subsystem ID: 100
Ecal subsystem ID: 100
Barrel subassembly ID: 101
EndcapP subassembly ID: 102
EndcapN subassembly ID: 103
Expand All @@ -176,30 +176,37 @@ The unused IDs below are saved for future use.
Unused IDs: 107-109

</documentation>
<constant name="ECalSubAssembly_ID" value="100"/>
<constant name="ECalBarrel_ID" value="101"/>
<constant name="ECalEndcapP_ID" value="102"/>
<constant name="ECalEndcapN_ID" value="103"/>
<constant name="CrystalEndcap_ID" value="104"/>
<constant name="ECalBarrel2_ID" value="105"/>
<constant name="ECalEndcapPInsert_ID" value="106"/>
<constant name="ECalSubAssembly_ID" value="100"/><!-- UNUSED -->
<constant name="ECalBarrel_ID" value="101"/><!-- DEPRECATED -->
<constant name="EcalBarrel_ID" value="101"/>
<constant name="ECalEndcapP_ID" value="102"/><!-- DEPRECATED -->
<constant name="EcalEndcapP_ID" value="102"/>
<constant name="ECalEndcapN_ID" value="103"/><!-- DEPRECATED -->
<constant name="EcalEndcapN_ID" value="103"/>
<constant name="CrystalEndcap_ID" value="104"/><!-- UNUSED -->
<constant name="ECalBarrel2_ID" value="105"/><!-- DEPRECATED -->
<constant name="EcalBarrel2_ID" value="105"/>
<constant name="ECalEndcapPInsert_ID" value="106"/><!-- DEPRECATED -->
<constant name="EcalEndcapPInsert_ID" value="106"/>

<documentation>
#### (110-119) Hadronic Calorimeter

- HCal subsystem ID: 110
- Hcal subsystem ID: 110
- Barrel subassembly ID: 111
- EndcapP subassembly ID: 112
- EndcapN subassembly ID: 113

- Unused IDs: 117-119
</documentation>
<constant name="HCalSubAssembly_ID" value="110"/>
<constant name="HCalBarrel_ID" value="111"/>
<constant name="HCalEndcapP_ID" value="112"/>
<constant name="HCalEndcapN_ID" value="113"/>
<constant name="HCalSubAssembly_ID" value="110"/><!-- UNUSED -->
<constant name="HCalBarrel_ID" value="111"/><!-- DEPRECATED -->
<constant name="HcalBarrel_ID" value="111"/>
<constant name="HCalEndcapN_ID" value="113"/><!-- DEPRECATED -->
<constant name="HcalEndcapN_ID" value="113"/>
<constant name="PassiveSteelRingEndcapP_ID" value="114"/>
<constant name="HCalEndcapPInsert_ID" value="115"/>
<constant name="HCalEndcapPInsert_ID" value="115"/><!-- DEPRECATED -->
<constant name="HcalEndcapPInsert_ID" value="115"/>
<constant name="LFHCAL_ID" value="116"/>
<documentation>
#### (120-129) (near) Forward reserved
Expand Down
2 changes: 1 addition & 1 deletion compact/ecal/backward_PbWO4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#### Backwards Endcap EM Calorimeter
</documentation>
<detector
id="ECalEndcapN_ID"
id="EcalEndcapN_ID"
name="EcalEndcapN"
type="epic_HomogeneousCalorimeter"
readout="EcalEndcapNHits">
Expand Down
2 changes: 1 addition & 1 deletion compact/ecal/backward_hybrid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

Backwards Endcap EM Calorimeter, placements generated by script
</documentation>
<detector id="ECalEndcapN_ID" name="EcalEndcapN" type="epic_HybridCalorimeter" readout="EcalEndcapNHits">
<detector id="EcalEndcapN_ID" name="EcalEndcapN" type="epic_HybridCalorimeter" readout="EcalEndcapNHits">
<position x="0" y="0" z="EcalEndcapN_z0"/>
<rotation x="0" y="0" z="0"/>
</detector>
Expand Down
4 changes: 2 additions & 2 deletions compact/ecal/barrel_interlayers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
Silicon (Astropix) readout layers for imaging 3d showers
</comment>
<detector
id="ECalBarrel_ID"
id="EcalBarrel_ID"
name="EcalBarrelImaging"
type="epic_EcalBarrelImaging"
readout="EcalBarrelImagingHits"
Expand Down Expand Up @@ -227,7 +227,7 @@
---------------------------------------
</comment>
<detector
id="ECalBarrel2_ID"
id="EcalBarrel2_ID"
name="EcalBarrelScFi"
type="epic_EcalBarrelScFi"
readout="EcalBarrelScFiHits"
Expand Down
2 changes: 1 addition & 1 deletion compact/ecal/barrel_sciglass.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
An EM calorimeter with SciGlass blocks
</comment>

<detector id="ECalBarrel_ID" name="EcalBarrelSciGlass" type="epic_EcalBarrelSciGlass" readout="EcalBarrelSciGlassHits" vis="det_vis" calorimeterType="EM_BARREL">
<detector id="EcalBarrel_ID" name="EcalBarrelSciGlass" type="epic_EcalBarrelSciGlass" readout="EcalBarrelSciGlassHits" vis="det_vis" calorimeterType="EM_BARREL">
<comment>
Global detector dimensions from https://eic.jlab.org/Geometry/Detector/Detector-20220624102507.html
</comment>
Expand Down
2 changes: 1 addition & 1 deletion compact/ecal/forward_homogeneous.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

Insert shape is cut out from middle of detector
</documentation>
<detector id="ECalEndcapP_ID"
<detector id="EcalEndcapP_ID"
name="EcalEndcapP"
type="epic_EndcapCalorimeterWithInsertCutout"
readout="EcalEndcapPHits">
Expand Down
2 changes: 1 addition & 1 deletion compact/ecal/forward_insert_homogeneous.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

</documentation>
<detector
id="ECalEndcapPInsert_ID"
id="EcalEndcapPInsert_ID"
name="EcalEndcapPInsert"
type="epic_InsertCalorimeter"
vis="HcalEndcapInsertVis"
Expand Down
2 changes: 1 addition & 1 deletion compact/ecal/forward_scfi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
------------------------------------------
An EM calorimeter with ScFi modules
</comment>
<detector id="ECalEndcapP_ID"
<detector id="EcalEndcapP_ID"
name="EcalEndcapP"
type="epic_ScFiCalorimeter"
vis="EcalEndcapVis"
Expand Down
2 changes: 1 addition & 1 deletion compact/hcal/backward.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
### Backwards (Negative Z) Endcap Hadronic Calorimeter
</documentation>
<detector
id="HCalEndcapN_ID"
id="HcalEndcapN_ID"
name="HcalEndcapN"
type="epic_PolyhedraEndcapCalorimeter2"
readout="HcalEndcapNHits"
Expand Down
2 changes: 1 addition & 1 deletion compact/hcal/barrel_gdml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
### Barrel Hadronic Calorimeter
</documentation>
<detector
id="HCalBarrel_ID"
id="HcalBarrel_ID"
name="HcalBarrel"
type="epic_HcalBarrelGDML"
readout="HcalBarrelHits"
Expand Down
2 changes: 1 addition & 1 deletion compact/hcal/forward_insert.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

</documentation>
<detector
id="HCalEndcapPInsert_ID"
id="HcalEndcapPInsert_ID"
name="HcalEndcapPInsert"
type="epic_InsertCalorimeter"
vis="HcalEndcapInsertVis"
Expand Down