Skip to content
Snippets Groups Projects
Commit 2f743603 authored by Alex Jentsch's avatar Alex Jentsch Committed by Sylvester Joosten
Browse files

Resolve "Create a B0 Tracker Detector construction"

parent ec4ab8c6
Branches
Tags v0.3.0
1 merge request!25Resolve "Create a B0 Tracker Detector construction"
Pipeline #14041 failed
Stage: config
Stage: initialize
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
eic_ip6.xml
+ 5
− 4
View file @ 2f743603
......@@ -27,11 +27,11 @@
<constant name="B0Tracker_Station_2_ID" value="151"/>
<constant name="B0Tracker_Station_3_ID" value="152"/>
<constant name="B0Tracker_Station_4_ID" value="153"/>
<constant name="ForwardRomanPot_Station_1_ID" value="155"/>
<constant name="B0Preshower_Station_1_ID" value="154"/>
<constant name="ForwardRomanPot_Station_1_ID" value="155"/>
<constant name="ForwardRomanPot_Station_2_ID" value="156"/>
<constant name="ForwardRomanPotB_ID" value="157"/>
<constant name="ForwardRomanPotC_ID" value="158"/>
<constant name="ForwardOffMTracker_station_1_ID" value="159"/>
<constant name="ForwardOffMTracker_station_1_ID" value="159"/>
<constant name="ForwardOffMTracker_station_2_ID" value="160"/>
<constant name="ForwardOffMTracker_station_3_ID" value="161"/>
<constant name="ForwardOffMTracker_station_4_ID" value="162"/>
......@@ -65,6 +65,7 @@
<include ref="ip6/forward_ion_beamline.xml" />
<include ref="ip6/beampipe_hadron_B0.xml" />
<include ref="ip6/B0_tracker.xml"/>
<include ref="ip6/B0_preshower.xml"/>
<include ref="ip6/far_forward_offM_tracker.xml"/>
<include ref="ip6/far_forward_detectors.xml"/>
<include ref="ip6/roman_pots_eRD24_design.xml"/>
......
ip6/B0_preshower.xml 0 → 100644
+ 57
− 0
View file @ 2f743603
<?xml version="1.0" encoding="UTF-8"?>
<lccdd>
<define>
<comment>
---------------------------------
B0 Tracker Parameters
---------------------------------
</comment>
<constant name="B0Preshower_rotation" value="0.025*rad"/>
<constant name="B0Preshower_Station_1_xpos" value="0.15749922*m" />
<constant name="B0Preshower_Station_1_zpos" value="6.2*m" />
</define>
<detectors>
<detector
id="B0Preshower_Station_1_ID"
name="B0Preshower_Station_1"
readout="B0PreshowerHits"
type="ip6_SimpleDiskTracker"
insideTrackingVolume="true"
reflect="false"
vis="AnlRed">
<position x="B0Preshower_Station_1_xpos" y="0" z="B0Preshower_Station_1_zpos"/>
<rotation x="0*rad" y="B0Tracker_rotation" z="0*rad"/>
<layer id="1" vis="AnlBlue"
inner_z="1.0*cm"
inner_r="3.5*cm"
outer_r="15.0*cm"
phi1="-0.8*Pi*rad"
phi2="0.8*Pi*rad">
<slice material="PbWO4" thickness="1.0*cm" vis="AnlYellow"/>
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlYellow" sensitive="true" />
</layer>
<layer id="2"
vis="AnlBlue"
inner_z="1.0*cm"
inner_r="3.5*cm"
outer_r="10.0*cm"
phi1="0.8*Pi*rad"
phi2="-0.8*Pi*rad">
<slice material="PbWO4" thickness="1.0*cm" vis="AnlYellow"/>
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlYellow" sensitive="true" />
</layer>
</detector>
</detectors>
<readouts>
<readout name="B0PreshowerHits">
<segmentation type="CartesianGridXY" grid_size_x="1.0*mm" grid_size_y="1.0*mm" />
<id>system:8,barrel:3,layer:4,slice:4,x:32:-16,y:-16</id>
</readout>
</readouts>
</lccdd>
ip6/B0_tracker.xml
+ 31
− 20
View file @ 2f743603
......@@ -8,6 +8,17 @@
</comment>
<constant name="B0Tracker_zpos" value="B0PF_CenterPosition + B0PF_Length/2.0 - 50.0*cm"/>
<constant name="B0Tracker_zmin" value="B0PF_CenterPosition - B0PF_Length/2.0 + 10.0*cm "/>
<constant name="B0Tracker_rotation" value="0.025*rad"/>
<constant name="B0Tracker_Station_1_xpos" value="0.1375013*m" />
<constant name="B0Tracker_Station_1_zpos" value="5.4*m" />
<constant name="B0Tracker_Station_2_xpos" value="0.14250078*m" />
<constant name="B0Tracker_Station_2_zpos" value="5.6*m" />
<constant name="B0Tracker_Station_3_xpos" value="0.14750026*m" />
<constant name="B0Tracker_Station_3_zpos" value="5.8*m" />
<constant name="B0Tracker_Station_4_xpos" value="0.15249974*m" />
<constant name="B0Tracker_Station_4_zpos" value="6.0*m" />
</define>
<detectors>
......@@ -19,25 +30,25 @@
insideTrackingVolume="true"
reflect="false"
vis="AnlRed">
<position x="150*mm" y="0" z="B0Tracker_zmin"/>
<rotation x="0*rad" y="ionCrossingAngle" z="0*rad"/>
<position x="B0Tracker_Station_1_xpos" y="0" z="B0Tracker_Station_1_zpos"/>
<rotation x="0*rad" y="B0Tracker_rotation" z="0*rad"/>
<layer id="1" vis="AnlBlue"
inner_z="1.0*cm"
inner_r="3.5*cm"
outer_r="15.0*cm"
phi1="-0.8*Pi*rad"
phi2="0.8*Pi*rad">
<slice material="SiliconOxide" thickness="1.0*cm" vis="AnlBlue" sensitive="true" />
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlBlue" sensitive="true" />
</layer>
<layer id="2"
vis="AnlBlue"
inner_z="1.0*cm"
inner_r="3.5*cm"
outer_r="8.0*cm"
outer_r="10.0*cm"
phi1="0.8*Pi*rad"
phi2="-0.8*Pi*rad">
<slice material="SiliconOxide" thickness="1.0*cm" vis="AnlBlue" sensitive="true" />
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlBlue" sensitive="true" />
</layer>
</detector>
......@@ -49,8 +60,8 @@
insideTrackingVolume="true"
reflect="false"
vis="AnlRed">
<position x="150*mm" y="0" z="5700*mm"/>
<rotation x="0*rad" y="ionCrossingAngle" z="0*rad"/>
<position x="B0Tracker_Station_2_xpos" y="0" z="B0Tracker_Station_2_zpos"/>
<rotation x="0*rad" y="B0Tracker_rotation" z="0*rad"/>
<layer id="1"
vis="AnlBlue"
inner_z="1.0*cm"
......@@ -58,17 +69,17 @@
outer_r="15.0*cm"
phi1="-0.8*Pi*rad"
phi2="0.8*Pi*rad">
<slice material="SiliconOxide" thickness="1.0*cm" vis="AnlBlue" sensitive="true" />
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlBlue" sensitive="true" />
</layer>
<layer id="2"
vis="AnlBlue"
inner_z="1.0*cm"
inner_r="3.5*cm"
outer_r="8.0*cm"
outer_r="11.0*cm"
phi1="0.8*Pi*rad"
phi2="-0.8*Pi*rad">
<slice material="SiliconOxide" thickness="1.0*cm" vis="AnlBlue" sensitive="true" />
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlBlue" sensitive="true" />
</layer>
</detector>
......@@ -81,8 +92,8 @@
insideTrackingVolume="true"
reflect="false"
vis="AnlRed">
<position x="150*mm" y="0" z="6000*mm"/>
<rotation x="0*rad" y="ionCrossingAngle" z="0*rad"/>
<position x="B0Tracker_Station_3_xpos" y="0" z="B0Tracker_Station_3_zpos"/>
<rotation x="0*rad" y="B0Tracker_rotation" z="0*rad"/>
<layer id="1"
vis="AnlBlue"
inner_z="1.0*cm"
......@@ -90,17 +101,17 @@
outer_r="15.0*cm"
phi1="-0.8*Pi*rad"
phi2="0.8*Pi*rad">
<slice material="SiliconOxide" thickness="1.0*cm" vis="AnlBlue" sensitive="true" />
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlBlue" sensitive="true" />
</layer>
<layer id="2"
vis="AnlBlue"
inner_z="1.0*cm"
inner_r="3.5*cm"
outer_r="8.0*cm"
outer_r="11.0*cm"
phi1="0.8*Pi*rad"
phi2="-0.8*Pi*rad">
<slice material="SiliconOxide" thickness="1.0*cm" vis="AnlBlue" sensitive="true" />
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlBlue" sensitive="true" />
</layer>
......@@ -115,8 +126,8 @@
insideTrackingVolume="true"
reflect="false"
vis="AnlRed">
<position x="150*mm" y="0" z="6200*mm"/>
<rotation x="0*rad" y="ionCrossingAngle" z="0*rad"/>
<position x="B0Tracker_Station_4_xpos" y="0" z="B0Tracker_Station_4_zpos"/>
<rotation x="0*rad" y="B0Tracker_rotation" z="0*rad"/>
<layer id="1"
vis="AnlBlue"
inner_z="1.0*cm"
......@@ -124,17 +135,17 @@
outer_r="15.0*cm"
phi1="-0.8*Pi*rad"
phi2="0.8*Pi*rad">
<slice material="SiliconOxide" thickness="1.0*cm" vis="AnlBlue" sensitive="true" />
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlBlue" sensitive="true" />
</layer>
<layer id="2"
vis="AnlBlue"
inner_z="1.0*cm"
inner_r="3.5*cm"
outer_r="8.0*cm"
outer_r="12.0*cm"
phi1="0.8*Pi*rad"
phi2="-0.8*Pi*rad">
<slice material="SiliconOxide" thickness="1.0*cm" vis="AnlBlue" sensitive="true" />
<slice material="SiliconOxide" thickness="0.3*mm" vis="AnlBlue" sensitive="true" />
</layer>
......
ip6/beampipe_hadron_B0.xml
+ 1
− 1
View file @ 2f743603
......@@ -10,7 +10,7 @@
<detector id="BeamPipeB0_ID" name="BeamPipeB0" type="handronDownstreamBeamPipe" vis="BeamPipeVis">
<position x="0.150*m" y="0*m" z="5.9*m" />
<rotation x="0*rad" y="0.025*rad" z="0*rad" />
<rotation x="0*rad" y="0*rad" z="0*rad" />
</detector>
</detectors>
......
ip6/forward_ion_beamline.xml
+ 18
− 1
View file @ 2f743603
......@@ -5,8 +5,12 @@
<comment>
=====================================
(170-189) Forward Beamline Magnets
(170-177) Forward Hadron Beamline Magnets (up to B0pf)
=====================================
=====================================
(180-189) Forward Electron Beamline Magnets
=====================================
</comment>
<comment>
......@@ -63,6 +67,19 @@
<apperture x="B2PF_InnerRadius*2" y="B2PF_InnerRadius*2" r="B2PF_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
<detector id="180" name="Q0EF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="Q0EF_XPosition" y="0*m" z="Q0EF_CenterPosition" theta="Q0EF_RotationAngle" />
<dimensions x="5.0*cm" y="5.0*cm" z="Q0EF_Length" r="2.5*cm" />
<apperture x="Q0EF_InnerRadius*2" y="Q0EF_InnerRadius*2" r="Q0EF_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
<detector id="181" name="Q1EF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="Q1EF_XPosition" y="0*m" z="Q1EF_CenterPosition" theta="Q1EF_RotationAngle" />
<dimensions x="6.0*cm" y="6.0*cm" z="Q1EF_Length" r="3.0*cm" />
<apperture x="Q1EF_InnerRadius*2" y="Q1EF_InnerRadius*2" r="Q1EF_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
</detectors>
......
ip6/ip6_defs.xml
+ 14
− 0
View file @ 2f743603
......@@ -37,6 +37,8 @@
<constant name="B1PF_GradientMax" value="0.0*tesla/m"/>
<constant name="B1APF_GradientMax" value="0.0*tesla/m"/>
<constant name="B2PF_GradientMax" value="0.0*tesla/m"/>
<constant name="Q0EF_GradientMax" value="-9.55*tesla/m"/>
<constant name="Q1EF_GradientMax" value="4.363*tesla/m"/>
<constant name="B0PF_Bmax" value="-1.3*tesla"/>
<constant name="B0APF_Bmax" value="-3.474*tesla"/>
......@@ -46,6 +48,8 @@
<constant name="B1PF_Bmax" value="-3.4*tesla"/>
<constant name="B1APF_Bmax" value="-2.7*tesla"/>
<constant name="B2PF_Bmax" value="5.94*tesla"/>
<constant name="Q0EF_BMax" value="0.0*tesla"/>
<constant name="Q1EF_BMax" value="0.0*tesla"/>
<constant name="B0PF_InnerRadius" value="20.0*cm"/>
<constant name="B0APF_InnerRadius" value="4.3*cm"/>
......@@ -55,6 +59,8 @@
<constant name="B1PF_InnerRadius" value="13.5*cm"/>
<constant name="B1APF_InnerRadius" value="16.8*cm"/>
<constant name="B2PF_InnerRadius" value="20.0*cm"/>
<constant name="Q0EF_InnerRadius" value="0.02*cm"/>
<constant name="Q1EF_InnerRadius" value="0.485*cm"/>
<constant name="B0PF_RotationAngle" value="0.0*0.001*rad"/>
<constant name="B0APF_RotationAngle" value="25.0*0.001*rad"/>
......@@ -64,6 +70,8 @@
<constant name="B1PF_RotationAngle" value="34.0*0.001*rad"/>
<constant name="B1APF_RotationAngle" value="25.0*0.001*rad"/>
<constant name="B2PF_RotationAngle" value="25.0*0.001*rad"/>
<constant name="Q0EF_RotationAngle" value="0.0*rad"/>
<constant name="Q1EF_RotationAngle" value="0.0*rad"/>
<constant name="B0PF_CenterPosition" value="5.89913*m"/>
<constant name="B0APF_CenterPosition" value="7.69866*m"/>
......@@ -73,6 +81,8 @@
<constant name="B1PF_CenterPosition" value="18.0667*m"/>
<constant name="B1APF_CenterPosition" value="20.8159*m"/>
<constant name="B2PF_CenterPosition" value="41.9092*m"/>
<constant name="Q0EF_CenterPosition" value="5.2995*m"/>
<constant name="Q1EF_CenterPosition" value="10.259*m"/>
<constant name="B0PF_XPosition" value="0.132497*m"/>
<constant name="B0APF_XPosition" value="0.197995*m"/>
......@@ -82,6 +92,8 @@
<constant name="B1PF_XPosition" value="0.490747*m"/>
<constant name="B1APF_XPosition" value="0.600444*m"/>
<constant name="B2PF_XPosition" value="1.522232*m"/>
<constant name="Q0EF_XPosition" value="0.0*m"/>
<constant name="Q1EF_XPosition" value="0.0*m"/>
<constant name="B0PF_Length" value="1.2*m"/>
<constant name="B0APF_Length" value="0.6*m"/>
......@@ -91,6 +103,8 @@
<constant name="B1PF_Length" value="3.0*m"/>
<constant name="B1APF_Length" value="1.5*m"/>
<constant name="B2PF_Length" value="5.76*m"/>
<constant name="Q0EF_Length" value="1.2*m"/>
<constant name="Q1EF_Length" value="1.61*m"/>
</define>
src/hadronDownstreamBeamPipe.cpp
+ 2
− 2
View file @ 2f743603
......@@ -51,8 +51,8 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens) {
double drift_beam_pipe_angle = 0.0475492667;
double b0_hadron_tube_inner_r = 2.0; // cm
double b0_hadron_tube_outer_r = 2.2; //cm
double b0_hadron_tube_inner_r = 2.9; // cm
double b0_hadron_tube_outer_r = 3.1; //cm
double b0_hadron_tube_length = 120.0; //cm
double drift_hadron_section_1_inner_r = 19.5;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment