Skip to content

Commit f0b4f5e

Browse files
veprblveprbl
authored
Merge branch 'main' into fEcal_update
2 parents 0783137 + 0adcac6 commit f0b4f5e

22 files changed

+524
-1214
lines changed

‎.github/labeler.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
- changed-files:
33
- any-glob-to-any-file:
44
- "compact/**/backward_*"
5-
- "compact/**/mrich*"
65
- "compact/**/pfrich*"
76

87
"topic: barrel":
@@ -88,7 +87,6 @@
8887
- "src/*RICH*"
8988
- "src/*DIRC*"
9089
- "src/*TOF*"
91-
- "src/MRich*"
9290

9391
"topic: tracking":
9492
- all:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ jobs:
110110
source install/bin/thisepic.sh
111111
sed -i 's%\(<fiber\|<lens\)%<comment>\1%g; s%\(/fiber>\|/lens>\)%\1</comment>%g' \
112112
${DETECTOR_PATH}/compact/ecal/bic_default.xml \
113-
${DETECTOR_PATH}/compact/far_forward/ZDC_Ecal_WSciFi.xml \
114-
${DETECTOR_PATH}/compact/pid/mrich.xml
113+
${DETECTOR_PATH}/compact/far_forward/ZDC_Ecal_WSciFi.xml
115114
- uses: actions/upload-artifact@v5
116115
with:
117116
name: build-${{ matrix.CC }}-${{ matrix.release }}-fast-eic-shell

‎compact/definitions.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ The unused IDs below are saved for future use.
224224
- Unused IDs: 133-139
225225

226226
</documentation>
227-
<constant name="MRICH_ID" value="130"/>
228227
<constant name="BackwardRICH_ID" value="131"/>
229228
<constant name="BackwardTOF_ID" value="132"/>
230229

@@ -325,7 +324,7 @@ SubSystemNameFurtherDescriptor_quantity
325324
Examples:
326325
- TrackerBarrelInside_length
327326
- EcalEndcapP_rmin
328-
- MRichFresnelLens_thickness
327+
- TOFEndcapLayer_thickness
329328

330329
### Naming Barrel and Endcaps
331330

‎compact/display.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,6 @@
179179
<vis name="DRICH_sensor_vis" ref="AnlBlue" showDaughters="true" visible="true" />
180180
<vis name="DRICH_service_vis" ref="AnlGreen" showDaughters="true" visible="true" />
181181

182-
<vis name="MRICH_aerogel_vis" ref="AnlTeal" showDaughters="true" visible="true" />
183-
<vis name="MRICH_frame_vis" ref="AnlGold" showDaughters="true" visible="true" />
184-
<vis name="MRICH_lens_vis" ref="AnlGray" showDaughters="true" visible="true" />
185-
<vis name="MRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
186-
187182
<vis name="RICHServiceVis" ref="AnlGray" showDaughters="true" visible="true" />
188183

189184
<comment>

‎compact/display_detailed.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@
133133
<vis name="DRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
134134
<vis name="DRICH_sensor_vis" ref="AnlGreen" showDaughters="true" visible="true" />
135135

136-
<vis name="MRICH_aerogel_vis" ref="AnlTeal" showDaughters="true" visible="true" />
137-
<vis name="MRICH_frame_vis" ref="AnlGold" showDaughters="true" visible="true" />
138-
<vis name="MRICH_lens_vis" ref="AnlGray" showDaughters="true" visible="true" />
139-
<vis name="MRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
140-
141136
<vis name="RICHServiceVis" ref="AnlGray" showDaughters="true" visible="true" />
142137

143138
<comment>

‎compact/display_geoviewer.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@
133133
<vis name="DRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
134134
<vis name="DRICH_sensor_vis" ref="AnlGreen" showDaughters="true" visible="true" />
135135

136-
<vis name="MRICH_aerogel_vis" ref="AnlTeal" showDaughters="true" visible="true" />
137-
<vis name="MRICH_frame_vis" ref="AnlGold" showDaughters="true" visible="true" />
138-
<vis name="MRICH_lens_vis" ref="AnlGray" showDaughters="true" visible="true" />
139-
<vis name="MRICH_mirror_vis" ref="AnlGray" showDaughters="true" visible="true" />
140-
141136
<vis name="RICHServiceVis" ref="AnlGray" showDaughters="true" visible="true" />
142137

143138
<comment>

‎compact/far_backward/beamline_electron.xml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
2+
<!-- Copyright (C) 2022-2025 Wouter Deconinck, Simon Gardner -->
3+
4+
<lccdd>
5+
6+
<detectors>
7+
8+
<comment> Electron side beam pipe volumes </comment>
9+
10+
<!-- Beam pipe going from Q1eR to B2BeR -->
11+
<detector
12+
name="Pipe_Q1eR_to_B2BeR"
13+
type="BeamPipeChain"
14+
wall_thickness="1 * mm"
15+
vis="BeamPipeVis">
16+
<pipe id="0" name="Pipe_to_Q1eR"
17+
xcenter="0" zcenter="(Center_Beampipe_End + Q1eR_CenterPosition+Q1eR_Length/2)/2"
18+
length="Center_Beampipe_End - (Q1eR_CenterPosition+Q1eR_Length/2)" theta="0"
19+
rout1="Center_Beampipe_Rad" rout2="Q1eR_InnerRadius">
20+
</pipe>
21+
<pipe id="1" name="Pipe_in_Q1eR"
22+
xcenter="0" zcenter="Q1eR_CenterPosition"
23+
length="Q1eR_Length" theta="0"
24+
rout1="Q1eR_InnerRadius" rout2="Q1eR_InnerRadius">
25+
</pipe>
26+
<pipe id="2" name="Pipe_Q1eR_to_Q2eR"/>
27+
<pipe id="3" name="Pipe_in_Q2eR"
28+
xcenter="0" zcenter="Q2eR_CenterPosition"
29+
length="Q2eR_Length" theta="0"
30+
rout1="Q2eR_InnerRadius" rout2="Q2eR_InnerRadius">
31+
</pipe>
32+
<pipe id="4" name="Pipe_Q2eR_to_B2AeR"/>
33+
<pipe id="5" name="Pipe_in_B2AeR"
34+
xcenter="0" zcenter="B2AeR_CenterPosition"
35+
length="B2AeR_Length" theta="0"
36+
rout1="B2AeR_InnerRadius" rout2="B2AeR_InnerRadius">
37+
</pipe>
38+
<pipe id="6" name="Pipe_B2AeR_to_B2BeR"/>
39+
<pipe id="7" name="Pipe_in_B2BeR"
40+
xcenter="0" zcenter="B2BeR_CenterPosition"
41+
length="B2BeR_Length" theta="0"
42+
rout1="B2BeR_InnerRadius" rout2="B2BeR_InnerRadius">
43+
</pipe>
44+
</detector>
45+
46+
<comment> Main beamline vacuum volume spanning between B2BeR and Q3eR magnets</comment>
47+
<detector name="BackwardsTaggerVacuum" type="FarBackwardVacuum" wall="Backwards_Box_Wall" lumi="true" vis="BeamPipeVis" >
48+
<focus x="Dipole_Focus_X" y="Dipole_Focus_Y" z="Dipole_Focus_Z" />
49+
<bounding xmin="Vacuum_BB_MinX" xmax="Vacuum_BB_MaxX"
50+
ymin="Vacuum_BB_MinY" ymax="Vacuum_BB_MaxY"
51+
zmin="Vacuum_BB_MinZ" zmax="Vacuum_BB_MaxZ"
52+
/>
53+
<rotation theta="Beam_Theta"/>
54+
<dimensions xL="Beam_WidthL" xR="Beam_WidthR" y="Beam_Height" z="Beam_Length"/>
55+
56+
<comment> Vacuum volume joining with lumi </comment>
57+
<exitdim x="Exit_Width" y="Exit_Height" lumiZ="LumiWin_Zstart" lumiR="LumiWin_R" maxTheta="Exit_Theta"/>
58+
59+
<comment> Extended vacuum volume for taggers </comment>
60+
<module id="1" name="Tagger1">
61+
<position x="Tagger1_Vac_Offset_X" y="Tagger1_Y" z="Tagger1_Vac_Offset_Z"/>
62+
<rotation theta="Tagger1_Theta"/>
63+
<dimensions x="Tagger1_Width" y="Tagger1_Height" z="2*Tagger1_Vac_Length"/>
64+
65+
<foilLayer id="0" type="foil" thickness="100*um" angle="70*deg"/>
66+
<windowLayer id="1" type="window" thickness="2*mm" material="CarbonFiber"/>
67+
</module>
68+
<module id="2" name="Tagger2">
69+
<position x="Tagger2_Vac_Offset_X" y="Tagger2_Y" z="Tagger2_Vac_Offset_Z"/>
70+
<rotation theta="Tagger2_Theta"/>
71+
<dimensions x="Tagger2_Width" y="Tagger2_Height" z="2*Tagger2_Vac_Length"/>
72+
73+
<foilLayer id="0" type="foil" thickness="100*um" angle="70*deg"/>
74+
<windowLayer id="1" type="window" thickness="2*mm" material="CarbonFiber"/>
75+
</module>
76+
77+
</detector>
78+
79+
</detectors>
80+
81+
</lccdd>

‎compact/far_backward/beamline_tracking.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@
3636
pipe_id="4"
3737
grandmother="Pipe_Q1eR_to_B2BeR"
3838
mother="Pipe_in_B2BeR_vacuum"
39-
name="Pipe_in_B2BeR_tracker"/>
39+
name="Pipe_in_B2BeR_tracker"
40+
use_cross_section="true"
41+
plane_z="B2BeR_CenterPosition-B2BeR_Length/2"
42+
plane_x="0*mm"
43+
plane_yrot="0*deg"/>
4044

4145
<slice
4246
pipe_id="5"

‎compact/far_backward/default.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<lccdd>
55

66
<include ref="magnets.xml"/>
7+
<include ref="beamline_electron.xml"/>
78

89
<!-- Scattered electron taggers -->
910
<include ref="taggers.xml"/>

‎compact/far_backward/definitions.xml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
<constant name="Timepix4height" value="28.16*mm"/>
202202
<constant name="Timepix4width" value="24.64*mm"/>
203203

204-
<comment> Tagger box and dimensions and positions </comment>
204+
<comment> Tagger1 box and dimensions and positions </comment>
205205
<constant name="Tagger1_Width" value="147.84*mm"/>
206206
<constant name="Tagger1_Height" value="200*mm"/>
207207

@@ -211,8 +211,19 @@
211211

212212
<constant name="Tagger1_Min_Theta" value="0.0262*rad"/>
213213
<constant name="Tagger1_Max_Theta" value="0.0410*rad"/>
214-
<constant name="Tagger1_Min_Offset" value="Q3eR_InnerRadius"/>
214+
<constant name="Tagger1_Min_Offset" value="Q3eR_InnerRadius+Backwards_Box_Wall"/>
215+
<constant name="Tagger1_Theta" value="Tagger1_Min_Theta"/>
215216

217+
<comment> Tagger1 calculated constants, shared between vacuum and detector </comment>
218+
<constant name="Tagger1_Vac_Offset_X" value="(-0.5*Tagger1_Width-Backwards_Box_Wall)*cos(Tagger1_Theta-Beam_Theta)"/>
219+
<constant name="Tagger1_Vac_Offset_Z" value="(0.5*Tagger1_Width+Backwards_Box_Wall)*sin(Tagger1_Theta-Beam_Theta)"/>
220+
<constant name="Tagger1_Vac_Length" value="(Tagger1_Min_Offset)/sin(Tagger1_Theta-Beam_Theta)"/>
221+
222+
<constant name="Tagger1_X" value="Dipole_Focus_X+Tagger1_Vac_Offset_X-Tagger1_Vac_Length*sin(Tagger1_Theta)"/>
223+
<constant name="Tagger1_Y" value="Dipole_Focus_Y"/>
224+
<constant name="Tagger1_Z" value="Dipole_Focus_Z+Tagger1_Vac_Offset_Z-Tagger1_Vac_Length*cos(Tagger1_Theta)"/>
225+
226+
<comment> Tagger2 box and dimensions and positions </comment>
216227
<constant name="Tagger2_Width" value="147.84*mm"/>
217228
<constant name="Tagger2_Height" value="150.0*mm"/>
218229

@@ -221,9 +232,20 @@
221232
<constant name="Tagger2_Length" value="Tag_Tracker_2_Depth"/>
222233

223234
<constant name="Tagger2_Min_Theta" value="0.02*rad"/>
224-
<constant name="Tagger2_Max_Theta" value="Tagger1_Min_Theta+0.000*rad"/>
235+
<constant name="Tagger2_Max_Theta" value="Tagger1_Min_Theta"/>
225236
<constant name="Tagger2_Min_Offset" value="Q3eR_InnerRadius+Backwards_Box_Wall"/>
226237

238+
<constant name="Tagger2_Theta" value="Tagger2_Max_Theta"/>
239+
240+
<comment> Tagger2 calculated constants, shared between vacuum and detector </comment>
241+
<constant name="Tagger2_Vac_Offset_X" value="0.5*Tagger2_Width*cos(Tagger2_Theta-Beam_Theta)"/>
242+
<constant name="Tagger2_Vac_Offset_Z" value="0.5*Tagger2_Width*sin(Tagger2_Theta-Beam_Theta)"/>
243+
<constant name="Tagger2_Vac_Length" value="(2*Tagger2_Vac_Offset_X+Tagger2_Min_Offset)/sin(Tagger2_Theta-Beam_Theta)"/>
244+
245+
<constant name="Tagger2_X" value="Dipole_Focus_X+Tagger2_Vac_Offset_X-Tagger2_Vac_Length*sin(Tagger2_Theta)"/>
246+
<constant name="Tagger2_Y" value="Dipole_Focus_Y"/>
247+
<constant name="Tagger2_Z" value="Dipole_Focus_Z+Tagger2_Vac_Offset_Z-Tagger2_Vac_Length*cos(Tagger2_Theta)"/>
248+
227249

228250
<!-- -->
229251
<!-- Luminosity System -->

0 commit comments

Comments
 (0)