Skip to content

Commit 1396de1

Browse files
simongesimonge
committed
Merge remote-tracking branch 'origin/main' into Prepare-for-lattice-update
2 parents a15c042 + 607af5f commit 1396de1

18 files changed

+282
-91
lines changed

‎.github/workflows/linux-eic-shell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ jobs:
393393
394394
trigger-container:
395395
runs-on: ubuntu-latest
396-
if: ${{ github.actor != 'dependabot[bot]' }}
396+
if: github.actor != 'dependabot[bot]' && github.ref != 'refs/heads/main'
397397
needs: [check-overlap-tgeo, check-overlap-geant4-fast]
398398
steps:
399399
- uses: eic/trigger-gitlab-ci@v3

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Overview
77

88
**Detector geometry:**
99
- [Empty viewer](https://eic.github.io/epic/geoviewer)
10-
- Craterlake: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_craterlake.root&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all) [step](https://eic.github.io/epic//artifacts/epic_craterlake_no_bhcal.stp/epic_craterlake_no_bhcal.stp)
10+
- Craterlake: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_craterlake.root&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_craterlake.root) [step](https://eic.github.io/epic//artifacts/epic_craterlake_no_bhcal.stp/epic_craterlake_no_bhcal.stp)
1111
- Subsystems:
1212
- Inner detector: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_inner_detector.root&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_inner_detector.root)
1313
- Calorimetry: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_calorimeters.root&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_calorimeters.root)
@@ -16,7 +16,7 @@ Overview
1616
- dRICH: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_drich_only.root&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_drich_only.root) [step](https://eic.github.io/epic//artifacts/epic_drich_only.stp/epic_drich_only.stp)
1717
- pfRICH: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_pfrich_only.root&item=default;1&opt=clipx;clipy;transp30;zoom55;ROTY49;ROTZ350;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_pfrich_only.root)
1818
- DIRC: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_dirc_only.root&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_dirc_only.root) [step](https://eic.github.io/epic//artifacts/epic_dirc_only.stp/epic_dirc_only.stp)
19-
- Tracking: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_tracking_only.root&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY320;ROTZ340;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_tracking_only.root) [step](https://eic.github.io/epic//artifacts/epic_craterlake_tracking_only.stp/epic_craterlake_tracking_only.stp)
19+
- Tracking: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_craterlake_tracking_only.root&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY320;ROTZ340;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_craterlake_tracking_only.root) [step](https://eic.github.io/epic//artifacts/epic_craterlake_tracking_only.stp/epic_craterlake_tracking_only.stp)
2020
- Vertex: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_vertex_only.root&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_vertex_only.root)
2121
- TOF: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_tof_only.root&item=default;1&opt=clipx;clipy;transp30;zoom55;ROTY49;ROTZ350;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_tof_only.root)
2222
- Beamline: [viewer](https://eic.github.io/epic/geoviewer?nobrowser&file=artifacts/tgeo/epic_ip6.root&item=default;1&opt=clipx;clipy;transp30;zoom40;ROTY290;ROTZ350;trz0;trr0;ctrl;all) [tgeo](https://eic.github.io/epic//artifacts/tgeo/epic_ip6.root) [step](https://eic.github.io/epic//artifacts/epic_ip6.stp/epic_ip6.stp)

‎compact/definitions.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ The unused IDs below are saved for future use.
175175
Unused IDs: 107-109
176176

177177
</documentation>
178-
<constant name="ECalSubAssembly_ID" value="100"/><!-- UNUSED -->
178+
<constant name="ECalSubAssembly_ID" value="100"/><!-- DEPRECATED -->
179+
<constant name="EcalSubAssembly_ID" value="100"/>
179180
<constant name="ECalBarrel_ID" value="101"/><!-- DEPRECATED -->
180181
<constant name="EcalBarrel_ID" value="101"/>
181182
<constant name="ECalEndcapP_ID" value="102"/><!-- DEPRECATED -->
@@ -487,6 +488,10 @@ Examples:
487488
<constant name="CentralTrackingRegionP_tan" value="Eta3_7_tan * 1.00" />
488489
<constant name="CentralTrackingRegionN_tan" value="Eta4_0_tan * 0.99" />
489490

491+
<constant name="InnerDetectorBarrelSupportCylinder_thickness" value="1*cm"/>
492+
<constant name="InnerDetectorBarrelSupportCylinder_rmin" value="71.0*cm"/> <!-- EPIC Envelope - 03-12-2025.stp -->
493+
<constant name="InnerDetectorBarrelSupportCylinder_rmax" value="InnerDetectorBarrelSupportCylinder_rmin + InnerDetectorBarrelSupportCylinder_thickness"/>
494+
490495
<documentation level="0">
491496
### PID Detector Region Parameters
492497
</documentation>
@@ -522,7 +527,7 @@ Examples:
522527

523528
<comment> Note: PID has space for DIRC, ExtraSpace sits past the PID</comment>
524529
<constant name="BarrelPIDRegion_thickness" value="7.0 * cm" />
525-
<constant name="BarrelExtraSpace_thickness" value="1.5 * cm" />
530+
<constant name="BarrelExtraSpace_thickness" value="0.0 * cm" />
526531

527532
<documentation>
528533
## Forward/backward tracking region behind the PID detectors

‎compact/ecal/bic/bic.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,13 @@
117117

118118
<detectors>
119119

120+
<detector id="EcalSubAssembly_ID"
121+
name="EcalBarrelTrackerSubAssembly"
122+
type="DD4hep_SubdetectorAssembly"
123+
vis="TrackerSubAssemblyVis">
124+
<composite name="EcalBarrelImaging"/>
125+
</detector>
126+
120127
<comment>
121128
---------------------------------------
122129
Imaging Layers of Barrel EM Calorimeter
@@ -131,9 +138,37 @@
131138
calorimeterType="EM_BARREL"
132139
vis="EcalBarrelEnvelopeVis"
133140
offset="EcalBarrel_Calorimeter_offset">
141+
<type_flags type="DetType_TRACKER + DetType_CALORIMETER + DetType_BARREL + DetType_ELECTROMAGNETIC"/>
134142
<dimensions numsides="EcalBarrel_SectorRepeat"
135143
rmin="EcalBarrel_rmin"
136144
z="EcalBarrel_Calorimeter_length"/>
145+
146+
<comment>
147+
The envelope for ACTS purposes needs to include only the first layer. The following
148+
definition includes the front support and is tangential to the outer edge of the
149+
first tray. This allows the envelope to avoid the first SFIL.
150+
</comment>
151+
<envelope vis="EcalBarrelImaging_envelope"
152+
rmin="EcalBarrel_rmin"
153+
rmax="EcalBarrel_rmin + EcalBarrel_FrontSupportThickness + EcalBarrel_ImagingLayerThickness"
154+
length="EcalBarrel_Calorimeter_length"
155+
zstart="EcalBarrel_Calorimeter_zmin"
156+
/>
157+
158+
<comment>
159+
The layer material for ACTS purposes is at the top level, since the entire BIC detector
160+
is treated as a single layer. The binning should likely be an integer multiple of the
161+
number of sectors, and of the numer of modules.
162+
</comment>
163+
<layer_material surface="inner"
164+
binning="binPhi,binZ"
165+
bins0="6 * EcalBarrel_SectorRepeat"
166+
bins1="floor(2. * EcalBarrel_Stave_length / (EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin))"/>
167+
<layer_material surface="outer"
168+
binning="binPhi,binZ"
169+
bins0="6 * EcalBarrel_SectorRepeat"
170+
bins1="floor(2. * EcalBarrel_Stave_length / (EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin))"/>
171+
137172
<sectors vis="EcalBarrelSectorVis"/>
138173

139174
<module name="AstroPix_Module"
@@ -372,4 +407,11 @@
372407
</readout>
373408
</readouts>
374409

410+
<plugins>
411+
<plugin name="DD4hep_ParametersPlugin">
412+
<argument value="EcalBarrelImaging"/>
413+
<argument value="layer_pattern: str=envelope"/>
414+
</plugin>
415+
</plugins>
416+
375417
</lccdd>

‎compact/ecal/bic/bic_layer1_only.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@
119119

120120
<detectors>
121121

122+
<detector id="EcalSubAssembly_ID"
123+
name="EcalBarrelTrackerSubAssembly"
124+
type="DD4hep_SubdetectorAssembly"
125+
vis="TrackerSubAssemblyVis">
126+
<composite name="EcalBarrelImaging"/>
127+
</detector>
128+
122129
<comment>
123130
---------------------------------------
124131
Imaging Layers of Barrel EM Calorimeter
@@ -133,9 +140,37 @@
133140
calorimeterType="EM_BARREL"
134141
vis="EcalBarrelEnvelopeVis"
135142
offset="EcalBarrel_Calorimeter_offset">
143+
<type_flags type="DetType_TRACKER + DetType_CALORIMETER + DetType_BARREL + DetType_ELECTROMAGNETIC"/>
136144
<dimensions numsides="EcalBarrel_SectorRepeat"
137145
rmin="EcalBarrel_rmin"
138146
z="EcalBarrel_Calorimeter_length"/>
147+
148+
<comment>
149+
The envelope for ACTS purposes needs to include only the first layer. The following
150+
definition includes the front support and is tangential to the outer edge of the
151+
first tray. This allows the envelope to avoid the first SFIL.
152+
</comment>
153+
<envelope vis="EcalBarrelImaging_envelope"
154+
rmin="EcalBarrel_rmin"
155+
rmax="EcalBarrel_rmin + EcalBarrel_FrontSupportThickness + EcalBarrel_ImagingLayerThickness"
156+
length="EcalBarrel_Calorimeter_length"
157+
zstart="EcalBarrel_Calorimeter_zmin"
158+
/>
159+
160+
<comment>
161+
The layer material for ACTS purposes is at the top level, since the entire BIC detector
162+
is treated as a single layer. The binning should likely be an integer multiple of the
163+
number of sectors, and of the numer of modules.
164+
</comment>
165+
<layer_material surface="inner"
166+
binning="binPhi,binZ"
167+
bins0="6 * EcalBarrel_SectorRepeat"
168+
bins1="floor(2. * EcalBarrel_Stave_length / (EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin))"/>
169+
<layer_material surface="outer"
170+
binning="binPhi,binZ"
171+
bins0="6 * EcalBarrel_SectorRepeat"
172+
bins1="floor(2. * EcalBarrel_Stave_length / (EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin))"/>
173+
139174
<sectors vis="EcalBarrelSectorVis"/>
140175

141176
<module name="AstroPix_Module"

‎compact/hcal/backward.xml‎

Lines changed: 10 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,19 @@
11
<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
2-
<!-- Copyright (C) 2022 Wouter Deconinck, Leszek Kosarzewski, Ryan Milton -->
2+
<!-- Copyright (C) 2022 - 2025 Wouter Deconinck, Leszek Kosarzewski, Ryan Milton -->
33

44
<lccdd>
5-
<define>
6-
<documentation>
7-
#### Material Thickness
8-
</documentation>
9-
<constant name="HcalEndcapNSteelThickness" value="4.0 * cm"/>
10-
<constant name="HcalEndcapNPolystyreneThickness" value="0.4 * cm"/>
11-
<constant name="HcalEndcapNLayerGap" value="0.1 * cm"/> <!-- 2*thicker than LFHCAL -->
12-
13-
<constant name="HcalEndcapN_polyhedron_rmax" value="251.444*cm"/>
14-
<constant name="HcalEndcapN_segments_rmin" value="19.9431*cm"/>
15-
<constant name="HcalEndcapN_segments_rmax" value="HcalEndcapN_rmax/(cos(180*deg/HcalEndcapN_CaloSides))"/>
16-
175

18-
<documentation>
19-
- Hcal Endcap N Layers and computed Thickness
20-
</documentation>
6+
<info name="backward.xml"
7+
title="EPIC nHCal default"
8+
author="L. Kosarzewski"
9+
status="development"
10+
version="1.0"
11+
><comment/></info>
2112

22-
<constant name="HcalEndcapNSingleLayerThickness"
23-
value="HcalEndcapNSteelThickness + HcalEndcapNPolystyreneThickness + HcalEndcapNLayerGap"/>
24-
<constant name="HcalEndcapNLayer_NRepeat" value="floor(HcalEndcapN_length / HcalEndcapNSingleLayerThickness)"/>
25-
<constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalEndcapNSingleLayerThickness"/>
13+
<define>
14+
<constant name="HcalEndcapN_allSensitive" value="0"/>
2615
</define>
2716

28-
29-
<!-- Define detector -->
30-
<detectors>
31-
<documentation>
32-
### Backwards (Negative Z) Endcap Hadronic Calorimeter
33-
</documentation>
34-
<detector
35-
id="HcalEndcapN_ID"
36-
name="HcalEndcapN"
37-
type="epic_PolyhedraEndcapCalorimeter2"
38-
readout="HcalEndcapNHits"
39-
vis="HcalEndcapVis"
40-
calorimeterType="HAD_ENDCAP">
41-
<position x="0" y="0" z="0"/>
42-
<dimensions
43-
numsides="HcalEndcapN_CaloSides"
44-
zmin="HcalEndcapN_zmin"
45-
rmin="HcalEndcapN_rmin"
46-
rmax="HcalEndcapN_rmax"/>
47-
<layer repeat="HcalEndcapNLayer_NRepeat" vis="HcalEndcapLayerVis" >
48-
<slice material="StainlessSteelSAE304" thickness="HcalEndcapNSteelThickness" vis="HcalAbsorberVis"/>
49-
<slice material="Air" thickness="HcalEndcapNLayerGap/2" vis="InvisibleNoDaughters"/>
50-
<slice material="Polystyrene" thickness="HcalEndcapNPolystyreneThickness" vis="HcalSensorVis" sensitive="yes" limits="cal_limits"/>
51-
<slice material="Air" thickness="HcalEndcapNLayerGap/2" vis="InvisibleNoDaughters"/>
52-
</layer>
53-
</detector>
54-
</detectors>
55-
56-
<!-- Definition of the readout segmentation/definition -->
57-
<readouts>
58-
<readout name="HcalEndcapNHits">
59-
<segmentation type="CartesianGridXY" grid_size_x="100 * mm" grid_size_y ="100 * mm"/>
60-
<id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
61-
</readout>
62-
</readouts>
17+
<include ref="backward_template.xml"/>
6318

6419
</lccdd>

‎compact/hcal/backward_sampF.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
2+
<!-- Copyright (C) Leszek Kosarzewski -->
3+
4+
<lccdd>
5+
6+
<info name="backward_sampF.xml"
7+
title="EPIC nHCal with all layers sensitive"
8+
author="L. Kosarzewski"
9+
status="development"
10+
version="1.0"
11+
><comment/></info>
12+
13+
<define>
14+
<constant name="HcalEndcapN_allSensitive" value="1"/>
15+
</define>
16+
17+
<include ref="backward_template.xml"/>
18+
19+
</lccdd>

‎compact/hcal/backward_template.xml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
2+
<!-- Copyright (C) 2022 - 2025 Wouter Deconinck, Leszek Kosarzewski, Ryan Milton -->
3+
4+
<lccdd>
5+
<define>
6+
<documentation>
7+
#### Material Thickness
8+
</documentation>
9+
<constant name="HcalEndcapNSteelThickness" value="4.0 * cm"/>
10+
<constant name="HcalEndcapNPolystyreneThickness" value="0.4 * cm"/>
11+
<constant name="HcalEndcapNLayerGap" value="0.1 * cm"/> <!-- 2*thicker than LFHCAL -->
12+
13+
<constant name="HcalEndcapN_polyhedron_rmax" value="251.444*cm"/>
14+
<constant name="HcalEndcapN_segments_rmin" value="19.9431*cm"/>
15+
<constant name="HcalEndcapN_segments_rmax" value="HcalEndcapN_rmax/(cos(180*deg/HcalEndcapN_CaloSides))"/>
16+
17+
18+
<documentation>
19+
- Hcal Endcap N Layers and computed Thickness
20+
</documentation>
21+
22+
<constant name="HcalEndcapNSingleLayerThickness"
23+
value="HcalEndcapNSteelThickness + HcalEndcapNPolystyreneThickness + HcalEndcapNLayerGap"/>
24+
<constant name="HcalEndcapNLayer_NRepeat" value="floor(HcalEndcapN_length / HcalEndcapNSingleLayerThickness)"/>
25+
<constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalEndcapNSingleLayerThickness"/>
26+
</define>
27+
28+
29+
<!-- Define detector -->
30+
<detectors>
31+
<documentation>
32+
### Backwards (Negative Z) Endcap Hadronic Calorimeter
33+
</documentation>
34+
<detector
35+
id="HcalEndcapN_ID"
36+
name="HcalEndcapN"
37+
type="epic_PolyhedraEndcapCalorimeter2"
38+
readout="HcalEndcapNHits"
39+
vis="HcalEndcapVis"
40+
calorimeterType="HAD_ENDCAP"
41+
allSensitive="HcalEndcapN_allSensitive"
42+
>
43+
<position x="0" y="0" z="0"/>
44+
<dimensions
45+
numsides="HcalEndcapN_CaloSides"
46+
zmin="HcalEndcapN_zmin"
47+
rmin="HcalEndcapN_rmin"
48+
rmax="HcalEndcapN_rmax"/>
49+
<layer repeat="HcalEndcapNLayer_NRepeat" vis="HcalEndcapLayerVis" >
50+
<slice material="StainlessSteelSAE304" thickness="HcalEndcapNSteelThickness" vis="HcalAbsorberVis"/>
51+
<slice material="Air" thickness="HcalEndcapNLayerGap/2" vis="InvisibleNoDaughters"/>
52+
<slice material="Polystyrene" thickness="HcalEndcapNPolystyreneThickness" vis="HcalSensorVis" sensitive="yes" limits="cal_limits"/>
53+
<slice material="Air" thickness="HcalEndcapNLayerGap/2" vis="InvisibleNoDaughters"/>
54+
</layer>
55+
</detector>
56+
</detectors>
57+
58+
<!-- Definition of the readout segmentation/definition -->
59+
<readouts>
60+
<readout name="HcalEndcapNHits">
61+
<segmentation type="CartesianGridXY" grid_size_x="100 * mm" grid_size_y ="100 * mm"/>
62+
<id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
63+
</readout>
64+
</readouts>
65+
66+
</lccdd>

‎compact/pid/dirc.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
<constant name="DIRCBar_length" value="(DIRCBarAssm_length - DIRCBar_count_z * DIRCGlue_thickness)/DIRCBar_count_z"/>
6767
<constant name="DIRCBar_center" value="(DIRC_rmin + DIRC_rmax)/2" comment="Radial position of center of bar"/>
6868

69+
<!-- Rail -->
70+
<constant name="DIRCRail_rmin" value="InnerDetectorBarrelSupportCylinder_rmax"/>
71+
<constant name="DIRCRail_rmax" value="EcalBarrel_rmin"/>
72+
<constant name="DIRCRail_width" value="2 * (DIRCRail_rmax - DIRCRail_rmin) * sin(360*degree / DIRCBox_count / 2)"/>
6973
</define>
7074

7175
<materials>
@@ -158,8 +162,16 @@
158162
/>
159163
</module>
160164
<support>
161-
<rail height="78.50*mm" width="46.17*mm" length="DIRCBar_count_z*DIRCBar_length" material="Aluminum">
162-
<position x="20*mm" y="0" z="0"/>
165+
<comment>
166+
Rail is a triangle with its point on the carbon fiber support cylinder,
167+
and its edges perpendicular to the DIRC planes (30 degree opening angle).
168+
The width is the length of the outer chord, with addition of the width
169+
specified below to avoid singular points of contact with the cylinder.
170+
</comment>
171+
<rail rmin="DIRCRail_rmin" rmax="DIRCRail_rmax" width="2*mm"
172+
length="DIRCBar_count_z * DIRCBar_length"
173+
material="Aluminum">
174+
<position x="(DIRCRail_rmax + DIRCRail_rmin) / 2.0 - DIRCBar_center" y="0" z="0"/>
163175
</rail>
164176
</support>
165177
</detector>

‎compact/tracking/support_service_craterlake.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,13 @@
309309
<constant name="TrackerSupportDRICHCylSegment_length" value="TrackerSupportDRICHCylSegment_zmax - TrackerSupportDRICHCylSegment_zmin" />
310310

311311
<comment> Inner detector support cylinder </comment>
312-
<constant name="InnerDetectorBarrelSupportCylCF_thickness" value="1.0*cm" />
312+
<constant name="InnerDetectorBarrelSupportCylCF_thickness" value="InnerDetectorBarrelSupportCylinder_thickness" />
313313
<constant name="InnerDetectorBarrelSupportCylCF_zmin1" value="DIRCBackward_zmax" />
314314
<constant name="InnerDetectorBarrelSupportCylCF_zmin2" value="DIRCForward_zmax" />
315315
<constant name="InnerDetectorBarrelSupportCylCF_length" value="InnerDetectorBarrelSupportCylCF_zmin1 + InnerDetectorBarrelSupportCylCF_zmin2" />
316316
<constant name="InnerDetectorBarrelSupportCylCF_offset" value="(InnerDetectorBarrelSupportCylCF_zmin2 - InnerDetectorBarrelSupportCylCF_zmin1)/2.0"/>
317-
<constant name="InnerDetectorBarrelSupportCylCF_rmin" value="MPGDOuterBarrelModule_rmin - InnerDetectorBarrelSupportCylCF_thickness - 2*mm" />
317+
<constant name="InnerDetectorBarrelSupportCylCF_rmin" value="InnerDetectorBarrelSupportCylinder_rmin" />
318+
<constant name="InnerDetectorBarrelSupportCylCF_rmax" value="InnerDetectorBarrelSupportCylinder_rmin + InnerDetectorBarrelSupportCylinder_thickness" />
318319

319320
</define>
320321

@@ -437,6 +438,7 @@
437438
vis="TrackerSupportVis"
438439
rmin1="OuterSupportConeN_rmin2"
439440
rmin2="OuterSupportConeN_rmin1"
441+
rmax="InnerDetectorBarrelSupportCylCF_rmin"
440442
length="OuterSupportConeN_length"
441443
thickness="OuterSupportConeN_thickness">
442444
<position x="0*cm" y="0*cm" z="-OuterSupportConeN_z" />

0 commit comments

Comments
 (0)