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

Resolve "Begin update of ZDC design"

parent e303623b
Branches
Tags
1 merge request!85Resolve "Begin update of ZDC design"
Pipeline #21695 failed
Stage: config
Stage: initialize
Stage: test
Stage: docs
Stage: collect
Stage: deploy
Hide whitespace changes
Inline Side-by-side
ip6/far_forward_ZDC_Ecal.xml
+ 4
− 4
View file @ acbd2ae2
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
<position x="ffi_ZDC_ECAL_x_pos" y="ffi_ZDC_ECAL_y_pos" z="ffi_ZDC_ECAL_z_pos"/> <position x="ffi_ZDC_ECAL_x_pos" y="ffi_ZDC_ECAL_y_pos" z="ffi_ZDC_ECAL_z_pos"/>
<rotation x="ffi_ZDC_ECAL_rotateX_angle" y="ffi_ZDC_ECAL_rotateY_angle" z="ffi_ZDC_ECAL_rotateZ_angle"/> <rotation x="ffi_ZDC_ECAL_rotateX_angle" y="ffi_ZDC_ECAL_rotateY_angle" z="ffi_ZDC_ECAL_rotateZ_angle"/>
<dimensions x="ffi_ZDC_ECAL_width" z="ffi_ZDC_ECAL_length"/> <dimensions x="ffi_ZDC_ECAL_width" z="ffi_ZDC_ECAL_length"/>
<layer repeat="ffi_ZDC_SiPbWO4_NRepeat"> <layer repeat="ffi_ZDC_SiWSciFi_NRepeat">
<slice name="Silicon_1_slice" material="Silicon" thickness="ffi_ZDC_Silicon_1_Thickness" vis="RedVis" sensitive="true"/> <slice name="Silicon_1_slice" material="Silicon" thickness="ffi_ZDC_Silicon_1_Thickness" vis="RedVis" sensitive="true"/>
<slice name="Glue_1_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_Glue_1_Thickness" vis="AnlGold"/> <slice name="Glue_1_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_Glue_1_Thickness" vis="AnlGold"/>
<slice name="FPC_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_FPC_Thickness" vis="AnlGold"/> <slice name="FPC_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_FPC_Thickness" vis="AnlGold"/>
<slice name="Air_1_slice" material="Air" thickness="ffi_ZDC_Air_1_Thickness" vis="InvisibleNoDaughters"/> <slice name="Air_1_slice" material="Air" thickness="ffi_ZDC_Air_1_Thickness" vis="InvisibleNoDaughters"/>
<slice name="PbWO4_slice" material="PbWO4" thickness="ffi_ZDC_PbWO4_Thickness" vis="AnlGold" sensitive="true"/> <slice name="WSciFi_slice" material="ZDC_WSciFiMixture" thickness="ffi_ZDC_WSciFi_Thickness" vis="AnlGold" sensitive="true"/> <!-- now this is a WSciFi mixture -->
<slice name="Air_2_slice" material="Air" thickness="ffi_ZDC_Air_2_Thickness" vis="InvisibleNoDaughters"/> <slice name="Air_2_slice" material="Air" thickness="ffi_ZDC_Air_2_Thickness" vis="InvisibleNoDaughters"/>
</layer> </layer>
</detector> </detector>
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
<readout name="ffi_ZDC_ECAL_Hits"> <readout name="ffi_ZDC_ECAL_Hits">
<segmentation type="MultiSegmentation" key="slice"> <segmentation type="MultiSegmentation" key="slice">
<segmentation name="Si_HG_grid" type="CartesianGridXY" key_value="1" grid_size_x="3.0*mm" grid_size_y="3.0*mm"/> <segmentation name="Si_HG_grid" type="CartesianGridXY" key_value="1" grid_size_x="3.0*mm" grid_size_y="3.0*mm"/>
<segmentation name="PbWO4_grid" type="CartesianGridXY" key_value="5" grid_size_x="3.0*cm" grid_size_y="3.0*cm"/> <segmentation name="WSciFi_grid" type="CartesianGridXY" key_value="5" grid_size_x="2.5*cm" grid_size_y="2.5*cm"/>
</segmentation> </segmentation>
<hits_collections> <hits_collections>
<hits_collection name="ffiZDCSiHits" key="slice" key_value="1"/> <hits_collection name="ffiZDCSiHits" key="slice" key_value="1"/>
<hits_collection name="ffiZDCPbWO4Hits" key="slice" key_value="5"/> <hits_collection name="ffiZDCWSciFiHits" key="slice" key_value="5"/>
</hits_collections> </hits_collections>
<id>system:8,layer:12,slice:12,x:32:-16,y:-16</id> <id>system:8,layer:12,slice:12,x:32:-16,y:-16</id>
</readout> </readout>
......
ip6/far_forward_ZDC_Hcal.xml
+ 11
− 9
View file @ acbd2ae2
...@@ -11,22 +11,24 @@ ...@@ -11,22 +11,24 @@
<position x="ffi_ZDC_HCAL_x_pos" y="ffi_ZDC_HCAL_y_pos" z="ffi_ZDC_HCAL_z_pos"/> <position x="ffi_ZDC_HCAL_x_pos" y="ffi_ZDC_HCAL_y_pos" z="ffi_ZDC_HCAL_z_pos"/>
<rotation x="ffi_ZDC_HCAL_rotateX_angle" y="ffi_ZDC_HCAL_rotateY_angle" z="ffi_ZDC_HCAL_rotateZ_angle"/> <rotation x="ffi_ZDC_HCAL_rotateX_angle" y="ffi_ZDC_HCAL_rotateY_angle" z="ffi_ZDC_HCAL_rotateZ_angle"/>
<dimensions x="ffi_ZDC_HCAL_width" z="ffi_ZDC_HCAL_length"/> <dimensions x="ffi_ZDC_HCAL_width" z="ffi_ZDC_HCAL_length"/>
<layer repeat="ffi_ZDC_SiPb_NRepeat">
<slice name="Lead_slice" material="Pb" thickness="ffi_ZDC_Lead_Thickness" vis="BlueGreenVis"/>
<slice name="Glue_1_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_Glue_1_Thickness" vis="AnlGold"/>
<slice name="Silicon_2_slice" material="Silicon" thickness="ffi_ZDC_Silicon_2_Thickness" vis="RedVis" sensitive="true"/>
<slice name="Glue_2_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_Glue_2_Thickness" vis="AnlGold"/>
<slice name="FPC_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_FPC_Thickness" vis="AnlGold"/>
<slice name="Air_3_slice" material="Air" thickness="ffi_ZDC_Air_3_Thickness" vis="InvisibleNoDaughters"/>
</layer>
<layer repeat="ffi_ZDC_Gap_NRepeat"> <layer repeat="ffi_ZDC_Gap_NRepeat">
<slice name="Gap_slice" material="Air" thickness="ffi_ZDC_Gap_Thickness" vis="InvisibleNoDaughters"/> <slice name="Gap_slice" material="Air" thickness="ffi_ZDC_Gap_Thickness" vis="InvisibleNoDaughters"/>
</layer> </layer>
<layer repeat="ffi_ZDC_PbScint_NRepeat"> <layer repeat="ffi_ZDC_PbScint_NRepeat">
<slice name="Lead_slice" material="Pb" thickness="ffi_ZDC_Lead_Thickness" vis="BlueGreenVis"/> <slice name="Lead_slice" material="Pb" thickness="ffi_ZDC_Lead_Thickness" vis="BlueGreenVis"/>
<slice name="Scint_slice" material="ZDC_Scintillator" thickness="ffi_ZDC_Scint_Thickness" vis="AnlOrange" sensitive="true"/> <slice name="Scint_slice" material="ZDC_Scintillator" thickness="ffi_ZDC_Scint_Thickness" vis="AnlOrange" sensitive="true"/>
<slice name="Air_4_slice" material="Air" thickness="ffi_ZDC_Air_4_Thickness" vis="InvisibleNoDaughters"/> <slice name="Air_4_slice" material="Air" thickness="ffi_ZDC_Air_4_Thickness" vis="InvisibleNoDaughters"/>
</layer> </layer>
<layer repeat="ffi_ZDC_SiPb_NRepeat">
<slice name="Lead_slice" material="Pb" thickness="ffi_ZDC_Lead_Thickness" vis="BlueGreenVis"/>
<slice name="Glue_1_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_Glue_1_Thickness" vis="AnlGold"/>
<slice name="Silicon_2_slice" material="Silicon" thickness="ffi_ZDC_Silicon_2_Thickness" vis="RedVis" sensitive="true"/>
<slice name="Glue_2_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_Glue_2_Thickness" vis="AnlGold"/>
<slice name="FPC_slice" material="ZDC_EpoxyGlue" thickness="ffi_ZDC_FPC_Thickness" vis="AnlGold"/>
<slice name="Air_3_slice" material="Air" thickness="ffi_ZDC_Air_3_Thickness" vis="InvisibleNoDaughters"/>
</layer>
<layer repeat="ffi_ZDC_Gap_NRepeat"> <layer repeat="ffi_ZDC_Gap_NRepeat">
<slice name="Gap_slice" material="Air" thickness="ffi_ZDC_Gap_Thickness" vis="InvisibleNoDaughters"/> <slice name="Gap_slice" material="Air" thickness="ffi_ZDC_Gap_Thickness" vis="InvisibleNoDaughters"/>
</layer> </layer>
......
ip6/far_forward_detectors.xml
+ 6
− 6
View file @ acbd2ae2
...@@ -30,17 +30,17 @@ ...@@ -30,17 +30,17 @@
<constant name="ffi_ZDC_ECAL_rotateZ_angle" value="ffi_ZDC_rotateZ_angle"/> <constant name="ffi_ZDC_ECAL_rotateZ_angle" value="ffi_ZDC_rotateZ_angle"/>
<constant name="ffi_ZDC_ECAL_width" value="ffi_ZDC_width"/> <constant name="ffi_ZDC_ECAL_width" value="ffi_ZDC_width"/>
<constant name="ffi_ZDC_SiPbWO4_NRepeat" value="1"/> <constant name="ffi_ZDC_SiWSciFi_NRepeat" value="1"/>
<constant name="ffi_ZDC_Silicon_1_Thickness" value="300.0 * um"/> <constant name="ffi_ZDC_Silicon_1_Thickness" value="300.0 * um"/>
<constant name="ffi_ZDC_PbWO4_Thickness" value="100.0 * mm"/> <constant name="ffi_ZDC_WSciFi_Thickness" value="170.0 * mm"/> <!-- length of WSciFi tower block -->
<constant name="ffi_ZDC_Glue_1_Thickness" value="0.11 * mm"/> <constant name="ffi_ZDC_Glue_1_Thickness" value="0.11 * mm"/>
<constant name="ffi_ZDC_FPC_Thickness" value="0.28 * mm"/> <constant name="ffi_ZDC_FPC_Thickness" value="0.28 * mm"/>
<constant name="ffi_ZDC_Air_1_Thickness" value="1.2 * mm"/> <constant name="ffi_ZDC_Air_1_Thickness" value="1.2 * mm"/>
<constant name="ffi_ZDC_Air_2_Thickness" value="3.0 * cm"/> <constant name="ffi_ZDC_Air_2_Thickness" value="3.0 * cm"/>
<constant name="ffi_ZDC_ECAL_layer_thickness" value="ffi_ZDC_Silicon_1_Thickness + ffi_ZDC_Glue_1_Thickness + ffi_ZDC_FPC_Thickness + ffi_ZDC_Air_1_Thickness + ffi_ZDC_PbWO4_Thickness + ffi_ZDC_Air_2_Thickness"/> <constant name="ffi_ZDC_ECAL_layer_thickness" value="ffi_ZDC_Silicon_1_Thickness + ffi_ZDC_Glue_1_Thickness + ffi_ZDC_FPC_Thickness + ffi_ZDC_Air_1_Thickness + ffi_ZDC_WSciFi_Thickness + ffi_ZDC_Air_2_Thickness"/>
<constant name="ffi_ZDC_ECAL_length" value="ffi_ZDC_SiPbWO4_NRepeat * ffi_ZDC_ECAL_layer_thickness"/> <constant name="ffi_ZDC_ECAL_length" value="ffi_ZDC_SiWSciFi_NRepeat * ffi_ZDC_ECAL_layer_thickness"/>
<comment> <comment>
------------------------------- -------------------------------
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<constant name="ffi_ZDC_HCAL_width" value="ffi_ZDC_width"/> <constant name="ffi_ZDC_HCAL_width" value="ffi_ZDC_width"/>
<constant name="ffi_ZDC_HCAL_length" value="ffi_ZDC_length"/> <constant name="ffi_ZDC_HCAL_length" value="ffi_ZDC_length"/>
<constant name="ffi_ZDC_SiPb_NRepeat" value="12"/> <constant name="ffi_ZDC_SiPb_NRepeat" value="2"/> <!-- changed from 12 -->
<constant name="ffi_ZDC_PbScint_NRepeat" value="19"/> <constant name="ffi_ZDC_PbScint_NRepeat" value="19"/>
<constant name="ffi_ZDC_Gap_NRepeat" value="1"/> <constant name="ffi_ZDC_Gap_NRepeat" value="1"/>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<constant name="ffi_ZDC_Glue_2_Thickness" value="0.13 * mm"/> <constant name="ffi_ZDC_Glue_2_Thickness" value="0.13 * mm"/>
<constant name="ffi_ZDC_Air_3_Thickness" value="1.0 * mm"/> <constant name="ffi_ZDC_Air_3_Thickness" value="1.0 * mm"/>
<constant name="ffi_ZDC_Air_4_Thickness" value="0.0013 * mm"/> <constant name="ffi_ZDC_Air_4_Thickness" value="0.0013 * mm"/>
<constant name="ffi_ZDC_Lead_Thickness" value="30.0 * mm"/> <constant name="ffi_ZDC_Lead_Thickness" value="10.0 * mm"/>
<constant name="ffi_ZDC_Scint_Thickness" value="2.0 * mm"/> <constant name="ffi_ZDC_Scint_Thickness" value="2.0 * mm"/>
<constant name="ffi_ZDC_Gap_Thickness" value="2.0 * cm"/> <constant name="ffi_ZDC_Gap_Thickness" value="2.0 * cm"/>
</define> </define>
......
ip6/materials.xml
+ 6
− 0
View file @ acbd2ae2
...@@ -208,4 +208,10 @@ ...@@ -208,4 +208,10 @@
<composite n="8" ref="C"/> <composite n="8" ref="C"/>
<composite n="8" ref="H"/> <composite n="8" ref="H"/>
</material> </material>
<material name="ZDC_WSciFiMixture">
<D type="density" value="10.17" unit="g/cm3"/>
<composite n="0.950" ref="W"/>
<composite n="0.009" ref="H"/>
<composite n="0.041" ref="C"/>
</material>
</materials> </materials>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment