Skip to content

Commit e133025

Browse files
rakithabrakithab
authored
Merge pull request #638 from JamesShirk/features/solidTargets
Added solid targets based on docdb 1464v3
2 parents a2f0a18 + eab282a commit e133025

19 files changed

+165
-111
lines changed

‎geometry/target/targetLadder.gdml‎

Lines changed: 132 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<second ref="TargetLadder2_solid"/>
1818
<position y="-400" unit="mm"/>
1919
</union>
20-
<box name="TargetPosition_solid" x="70" y="70" z="1300" lunit="mm"/>
20+
<box name="TargetPosition_solid" x="50" y="50" z="1300" lunit="mm"/>
2121

2222
<tube name="TargetLH2_solid"
2323
aunit="deg" lunit="mm" deltaphi="360"
@@ -29,13 +29,24 @@
2929
aunit="deg" lunit="mm" deltaphi="360"
3030
rmax="40" rmin="0" z="0.127"/>
3131

32-
<box name="TargetAlDummy2pct_solid" x="25*mm" y="25*mm" z="0.02*AlX0"/>
32+
<!-- see https://moller-docdb.physics.sunysb.edu/DocDB/0014/001464/003/SolidTargets.pdf -->
33+
34+
<box name="TargetAl_1mm_solid" x="25*mm" y="25*mm" z="1*mm"/>
35+
<box name="TargetAl_2mm_solid" x="25*mm" y="25*mm" z="2*mm"/>
36+
<box name="TargetAl_6mm_solid" x="25*mm" y="25*mm" z="6*mm"/>
37+
<box name="TargetAl_12_5mm_solid" x="25*mm" y="25*mm" z="12.5*mm"/>
38+
<box name="TargetC_2mm_solid" x="25*mm" y="25*mm" z="2*mm"/>
39+
<box name="TargetC_40mm_solid" x="25*mm" y="25*mm" z="40*mm"/>
40+
41+
42+
<!-- <box name="TargetAlDummy2pct_solid" x="25*mm" y="25*mm" z="0.02*AlX0"/>
3343
<box name="TargetAlDummy4pct_solid" x="25*mm" y="25*mm" z="0.04*AlX0"/>
3444
<box name="TargetAlDummy8pct_solid" x="25*mm" y="25*mm" z="0.08*AlX0"/>
35-
<tube name="TargetAlHole_solid" rmin="0" rmax="2*mm" z="0.10*AlX0" deltaphi="360" startphi="0" aunit="deg"/>
36-
<subtraction name="TargetAlDummyHole_solid">
37-
<first ref="TargetAlDummy4pct_solid"/>
38-
<second ref="TargetAlHole_solid"/>
45+
<box name="TargetAlDummy10pct_solid" x="25*mm" y="25*mm" z="0.1*AlX0"/> -->
46+
<tube name="TargetAlHole_solid" rmin="0" rmax="2*mm" z="2*mm" deltaphi="360" startphi="0" aunit="deg"/>
47+
<subtraction name="TargetAlHole">
48+
<first ref="TargetAlHole_solid"/>
49+
<second ref="TargetAl_2mm_solid"/>
3950
</subtraction>
4051

4152
<box name="TargetCFoil_solid" x="25*mm" y="25*mm" z="0.254*mm"/>
@@ -50,18 +61,21 @@
5061
<auxiliary auxtype="TargetSamplingVolume" auxvalue="USAl"/>
5162
<auxiliary auxtype="Color" auxvalue="white"/>
5263
</volume>
64+
5365
<volume name="targetLH2_LH2Volume_logical">
5466
<materialref ref="G4_lH2"/>
5567
<solidref ref="TargetLH2_LH2Volume_solid"/>
5668
<auxiliary auxtype="TargetSamplingVolume" auxvalue="LH2"/>
5769
<auxiliary auxtype="Color" auxvalue="blue"/>
5870
</volume>
71+
5972
<volume name="targetLH2_AlWindowDS_logical">
6073
<materialref ref="G4_Al"/>
6174
<solidref ref="TargetLH2_AlWindow_solid"/>
6275
<auxiliary auxtype="TargetSamplingVolume" auxvalue="DSAl"/>
6376
<auxiliary auxtype="Color" auxvalue="white"/>
6477
</volume>
78+
6579
<volume name="TargetLH2_logical">
6680
<materialref ref="G4_Galactic"/>
6781
<solidref ref="TargetLH2_solid"/>
@@ -84,92 +98,132 @@
8498
<auxiliary auxtype="TargetSystem" auxvalue="LH2"/>
8599
</volume>
86100

87-
<volume name="TargetAlDummyHoleUS_logical">
101+
<volume name="TargetAl_1_mm_logical">
88102
<materialref ref="G4_Al"/>
89-
<solidref ref="TargetAlDummyHole_solid"/>
90-
<auxiliary auxtype="TargetSamplingVolume" auxvalue="USAl"/>
103+
<solidref ref="TargetAl_1mm_solid"/>
104+
<auxiliary auxtype="TargetSamplingVolume" auxvalue="Al1mm"/>
91105
</volume>
92-
<volume name="TargetAlDummyHoleDS_logical">
106+
107+
<volume name="TargetAl_2_mm_logical">
93108
<materialref ref="G4_Al"/>
94-
<solidref ref="TargetAlDummyHole_solid"/>
95-
<auxiliary auxtype="TargetSamplingVolume" auxvalue="DSAl"/>
109+
<solidref ref="TargetAl_2mm_solid"/>
110+
<auxiliary auxtype="TargetSamplingVolume" auxvalue="Al2mm"/>
111+
</volume>
112+
113+
<volume name="TargetAl_6_mm_logical">
114+
<materialref ref="G4_Al"/>
115+
<solidref ref="TargetAl_6mm_solid"/>
116+
<auxiliary auxtype="TargetSamplingVolume" auxvalue="Al6mm"/>
117+
</volume>
118+
119+
<volume name="TargetAl_12_5_mm_logical">
120+
<materialref ref="G4_Al"/>
121+
<solidref ref="TargetAl_12_5mm_solid"/>
122+
<auxiliary auxtype="TargetSamplingVolume" auxvalue="Al12_5mm"/>
123+
</volume>
124+
125+
<volume name="TargetAlHole_logical">
126+
<materialref ref="G4_Al"/>
127+
<solidref ref="TargetAlHole_solid"/>
128+
<auxiliary auxtype="TargetSamplingVolume" auxvalue="AlHole"/>
96129
</volume>
97-
<volume name="TargetPositionAlDummyHoleUS_logical">
130+
131+
<volume name="TargetC_2_mm_logical">
132+
<materialref ref="G4_C"/>
133+
<solidref ref="TargetC_2mm_solid"/>
134+
<auxiliary auxtype="TargetSamplingVolume" auxvalue="C2mm"/>
135+
</volume>
136+
137+
<volume name="TargetC_40_mm_logical">
138+
<materialref ref="G4_C"/>
139+
<solidref ref="TargetC_40mm_solid"/>
140+
<auxiliary auxtype="TargetSamplingVolume" auxvalue="C40mm"/>
141+
</volume>
142+
143+
144+
145+
<volume name="TargetPositionAlHole_DS_logical">
98146
<materialref ref="G4_Galactic"/>
99147
<solidref ref="TargetPosition_solid"/>
100148
<physvol>
101-
<volumeref ref="TargetAlDummyHoleUS_logical"/>
102-
<position z="-125/2*cm"/>
149+
<volumeref ref="TargetAlHole_logical"/>
150+
<position z="+125/2*cm"/>
103151
</physvol>
104-
<auxiliary auxtype="TargetSystem" auxvalue="AlHoleUS"/>
152+
<auxiliary auxtype="TargetSystem" auxvalue="Al_Hole_DS"/>
105153
</volume>
106-
<volume name="TargetPositionAlDummyHoleDS_logical">
154+
155+
<volume name="TargetPositionAl6mm_DS_logical">
107156
<materialref ref="G4_Galactic"/>
108157
<solidref ref="TargetPosition_solid"/>
109158
<physvol>
110-
<volumeref ref="TargetAlDummyHoleDS_logical"/>
159+
<volumeref ref="TargetAl_6_mm_logical"/>
111160
<position z="+125/2*cm"/>
112161
</physvol>
113-
<auxiliary auxtype="TargetSystem" auxvalue="AlHoleDS"/>
162+
<auxiliary auxtype="TargetSystem" auxvalue="Al_6mm_DS"/>
114163
</volume>
115164

116-
<volume name="TargetAlDummy4pctDS_logical">
117-
<materialref ref="G4_Al"/>
118-
<solidref ref="TargetAlDummy4pct_solid"/>
119-
<auxiliary auxtype="TargetSamplingVolume" auxvalue="DSAl"/>
120-
</volume>
121-
<volume name="TargetAlDummy4pctUS_logical">
122-
<materialref ref="G4_Al"/>
123-
<solidref ref="TargetAlDummy4pct_solid"/>
124-
<auxiliary auxtype="TargetSamplingVolume" auxvalue="DSAl"/>
125-
</volume>
126-
<volume name="TargetAlDummy2pctDS_logical">
127-
<materialref ref="G4_Al"/>
128-
<solidref ref="TargetAlDummy2pct_solid"/>
129-
<auxiliary auxtype="TargetSamplingVolume" auxvalue="DSAl"/>
165+
<volume name="TargetPositionAl12_5mm_DS_logical">
166+
<materialref ref="G4_Galactic"/>
167+
<solidref ref="TargetPosition_solid"/>
168+
<physvol>
169+
<volumeref ref="TargetAl_12_5_mm_logical"/>
170+
<position z="+125/2*cm"/>
171+
</physvol>
172+
<auxiliary auxtype="TargetSystem" auxvalue="Al_12_5mm_DS"/>
130173
</volume>
131-
<volume name="TargetAlDummy2pctUS_logical">
132-
<materialref ref="G4_Al"/>
133-
<solidref ref="TargetAlDummy2pct_solid"/>
134-
<auxiliary auxtype="TargetSamplingVolume" auxvalue="USAl"/>
174+
175+
<volume name="TargetPositionC40mm_DS_logical">
176+
<materialref ref="G4_Galactic"/>
177+
<solidref ref="TargetPosition_solid"/>
178+
<physvol>
179+
<volumeref ref="TargetC_40_mm_logical"/>
180+
<position z="+125/2*cm"/>
181+
</physvol>
182+
<auxiliary auxtype="TargetSystem" auxvalue="C_40mm_DS"/>
135183
</volume>
136-
<volume name="TargetPositionAlDummy1US_logical">
184+
185+
<volume name="TargetPositionC2mm_US_logical">
137186
<materialref ref="G4_Galactic"/>
138187
<solidref ref="TargetPosition_solid"/>
139188
<physvol>
140-
<volumeref ref="TargetAlDummy4pctUS_logical"/>
189+
<volumeref ref="TargetC_2_mm_logical"/>
141190
<position z="-125/2*cm"/>
142191
</physvol>
143-
<auxiliary auxtype="TargetSystem" auxvalue="AlDummy1US"/>
192+
<auxiliary auxtype="TargetSystem" auxvalue="C_2mm_US"/>
144193
</volume>
145-
<volume name="TargetPositionAlDummy1DS_logical">
194+
195+
<volume name="TargetPositionAlHole_US_logical">
146196
<materialref ref="G4_Galactic"/>
147197
<solidref ref="TargetPosition_solid"/>
148198
<physvol>
149-
<volumeref ref="TargetAlDummy4pctDS_logical"/>
150-
<position z="+125/2*cm"/>
199+
<volumeref ref="TargetAlHole_logical"/>
200+
<position z="-125/2*cm"/>
151201
</physvol>
152-
<auxiliary auxtype="TargetSystem" auxvalue="AlDummy1DS"/>
202+
<auxiliary auxtype="TargetSystem" auxvalue="Al_Hole_US"/>
153203
</volume>
154-
<volume name="TargetPositionAlDummy2US_logical">
204+
205+
<volume name="TargetPositionAl1mm_US_logical">
155206
<materialref ref="G4_Galactic"/>
156207
<solidref ref="TargetPosition_solid"/>
157208
<physvol>
158-
<volumeref ref="TargetAlDummy2pctUS_logical"/>
209+
<volumeref ref="TargetAl_1_mm_logical"/>
159210
<position z="-125/2*cm"/>
160211
</physvol>
161-
<auxiliary auxtype="TargetSystem" auxvalue="AlDummy2US"/>
212+
<auxiliary auxtype="TargetSystem" auxvalue="Al_1mm_US"/>
162213
</volume>
163-
<volume name="TargetPositionAlDummy2DS_logical">
214+
215+
<volume name="TargetPositionAl2mm_US_logical">
164216
<materialref ref="G4_Galactic"/>
165217
<solidref ref="TargetPosition_solid"/>
166218
<physvol>
167-
<volumeref ref="TargetAlDummy2pctDS_logical"/>
168-
<position z="+125/2*cm"/>
219+
<volumeref ref="TargetAl_1_mm_logical"/>
220+
<position z="-125/2*cm"/>
169221
</physvol>
170-
<auxiliary auxtype="TargetSystem" auxvalue="AlDummy2DS"/>
222+
<auxiliary auxtype="TargetSystem" auxvalue="Al_2mm_US"/>
171223
</volume>
172224

225+
<!-- Optics Targets -->
226+
173227
<volume name="TargetCFoilUS_logical">
174228
<materialref ref="G4_C"/>
175229
<solidref ref="TargetCFoil_solid"/>
@@ -192,11 +246,6 @@
192246
<volume name="TargetPositionOptics1_logical">
193247
<materialref ref="G4_Galactic"/>
194248
<solidref ref="TargetPosition_solid"/>
195-
<!--<physvol>
196-
<volumeref ref="TargetCFoilUS_logical"/>
197-
<position z="-30*cm"/>
198-
</physvol>-->
199-
200249
<physvol>
201250
<volumeref ref="TargetCFoilDS_logical"/>
202251
<position z="-62.45*cm"/>
@@ -209,11 +258,6 @@
209258
<volume name="TargetPositionOptics2_logical">
210259
<materialref ref="G4_Galactic"/>
211260
<solidref ref="TargetPosition_solid"/>
212-
213-
<!--<physvol>
214-
<volumeref ref="TargetCFoilUS_logical"/>
215-
<position z="-60*cm"/>
216-
</physvol>-->
217261

218262
<physvol>
219263
<volumeref ref="TargetCFoilDS_logical"/>
@@ -226,12 +270,6 @@
226270
<volume name="TargetPositionOptics3_logical">
227271
<materialref ref="G4_Galactic"/>
228272
<solidref ref="TargetPosition_solid"/>
229-
230-
<!--<physvol>
231-
<volumeref ref="TargetCFoilUS_logical"/>
232-
<position z="-60*cm"/>
233-
</physvol>-->
234-
235273
<physvol>
236274
<volumeref ref="TargetCFoilDS_logical"/>
237275
<position z="+0.0127*cm"/>
@@ -249,48 +287,61 @@
249287
</physvol>
250288

251289
<physvol>
252-
<volumeref ref="TargetPositionAlDummyHoleUS_logical"/>
253-
<position y="-14*cm"/>
290+
<volumeref ref="TargetPositionAlHole_DS_logical"/>
291+
<position y="-10*cm"/>
254292
</physvol>
255293

256294
<physvol>
257-
<volumeref ref="TargetPositionAlDummyHoleDS_logical"/>
258-
<position y="-21*cm"/>
295+
<volumeref ref="TargetPositionAl6mm_DS_logical"/>
296+
<position y="-15*cm"/>
259297
</physvol>
260298

261299
<physvol>
262-
<volumeref ref="TargetPositionAlDummy1US_logical"/>
263-
<position y="-28*cm"/>
300+
<volumeref ref="TargetPositionAl12_5mm_DS_logical"/>
301+
<position y="-20*cm"/>
264302
</physvol>
265303

266304
<physvol>
267-
<volumeref ref="TargetPositionAlDummy1DS_logical"/>
305+
<volumeref ref="TargetPositionC40mm_DS_logical"/>
306+
<position y="-25*cm"/>
307+
</physvol>
308+
309+
<physvol>
310+
<volumeref ref="TargetPositionC2mm_US_logical"/>
311+
<position y="-30*cm"/>
312+
</physvol>
313+
314+
<physvol>
315+
<volumeref ref="TargetPositionAlHole_US_logical"/>
268316
<position y="-35*cm"/>
269317
</physvol>
270318

271319
<physvol>
272-
<volumeref ref="TargetPositionAlDummy2US_logical"/>
273-
<position y="-42*cm"/>
320+
<volumeref ref="TargetPositionAl1mm_US_logical"/>
321+
<position y="-40*cm"/>
274322
</physvol>
275323

276324
<physvol>
277-
<volumeref ref="TargetPositionAlDummy2DS_logical"/>
278-
<position y="-49*cm"/>
325+
<volumeref ref="TargetPositionAl2mm_US_logical"/>
326+
<position y="-45*cm"/>
279327
</physvol>
280328

329+
330+
<!-- There is empty space between here and the next in the real target ladder-->
331+
281332
<physvol>
282333
<volumeref ref="TargetPositionOptics1_logical"/>
283-
<position y="-56*cm"/>
334+
<position y="-50*cm"/>
284335
</physvol>
285336

286337
<physvol>
287338
<volumeref ref="TargetPositionOptics2_logical"/>
288-
<position y="-63*cm"/>
339+
<position y="-55*cm"/>
289340
</physvol>
290341

291342
<physvol>
292343
<volumeref ref="TargetPositionOptics3_logical"/>
293-
<position y="-70*cm"/>
344+
<position y="-60*cm"/>
294345
</physvol>
295346

296347
<auxiliary auxtype="TargetLadder" auxvalue=""/>

macros/runexample_AlDummy1US.mac renamed to macros/runexample_Al1mm_US.mac

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
/run/initialize
99

1010
# Set target ladder position
11-
/control/execute macros/target/AlDummy1US.mac
12-
#/control/execute macros/target/AlDummy1DS.mac
13-
#/control/execute macros/target/AlDummy2US.mac
14-
#/control/execute macros/target/AlDummy2DS.mac
11+
/control/execute macros/target/Al1mmUS.mac
12+
#/control/execute macros/target/Al2mmUS.mac
13+
#/control/execute macros/target/Al6mmDS.mac
14+
#/control/execute macros/target/Al12_5mmDS.mac
1515

1616
# Load magnetic fields
1717
/control/execute macros/load_magnetic_fieldmaps.mac

‎macros/target/Al12_5mmDS.mac‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/remoll/geometry/absolute_position targetLadder (0,200,0)
2+
/remoll/target/mother Al_12_5mm_DS
3+
/remoll/target/volume Al12_5mm

‎macros/target/Al1mmUS.mac‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/remoll/geometry/absolute_position targetLadder (0,400,0)
2+
/remoll/target/mother Al_1mm_US
3+
/remoll/target/volume Al1mm

‎macros/target/Al2mmUS.mac‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/remoll/geometry/absolute_position targetLadder (0,450,0)
2+
/remoll/target/mother Al_2mm_US
3+
/remoll/target/volume Al2mm

‎macros/target/Al6mmDS.mac‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/remoll/geometry/absolute_position targetLadder (0,150,0)
2+
/remoll/target/mother Al_6mm_DS
3+
/remoll/target/volume Al6mm

‎macros/target/AlDummy1DS.mac‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎macros/target/AlDummy1US.mac‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎macros/target/AlDummy2DS.mac‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎macros/target/AlDummy2US.mac‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)