From eb05d87fc3f634e7ede5f0160e7f49c85604b389 Mon Sep 17 00:00:00 2001
From: "jihee.kim" <jihee.kim@anl.gov>
Date: Mon, 21 Jun 2021 09:53:46 -0500
Subject: [PATCH] Added Pb + Scint layers
---
ip6/far_forward_ZDC_Hcal.xml | 17 ++++++++++++-----
ip6/far_forward_detectors.xml | 6 +++---
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ip6/far_forward_ZDC_Hcal.xml b/ip6/far_forward_ZDC_Hcal.xml
index a1d3c90..2736440 100644
--- a/ip6/far_forward_ZDC_Hcal.xml
+++ b/ip6/far_forward_ZDC_Hcal.xml
@@ -7,10 +7,13 @@
</comment>
<define>
- <constant name="ffi_ZDC_HCAL_NRepeat" value="40"/>
- <constant name="ffiZDCHcalTungstenThickness" value="3.5 * mm"/>
- <constant name="ffiZDCHcalSiliconThickness" value="500.0 * um"/>
- <constant name="ffiZDCHcalAirThickness" value="1.0 * mm"/>
+ <constant name="ffi_ZDC_HCAL_SiW_NRepeat" value="40"/>
+ <constant name="ffi_ZDC_HCAL_PbScint_NRepeat" value="30"/>
+ <constant name="ffiZDCHcalTungstenThickness" value="3.5 * mm"/>
+ <constant name="ffiZDCHcalSiliconThickness" value="500.0 * um"/>
+ <constant name="ffiZDCHcalAirThickness" value="1.0 * mm"/>
+ <constant name="ffiZDCHcalLeadThickness" value="30.0 * mm"/>
+ <constant name="ffiZDCHcalScintThickness" value="2.0 * mm"/>
</define>
<detectors>
@@ -18,11 +21,15 @@
<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"/>
<dimensions x="ffi_ZDC_HCAL_width" z="ffi_ZDC_HCAL_length"/>
- <layer repeat="ffi_ZDC_HCAL_NRepeat">
+ <layer repeat="ffi_ZDC_HCAL_SiW_NRepeat">
<slice name="Tungsten_slice" material="TungstenDens24" thickness="ffiZDCHcalTungstenThickness" vis="AnlBlue"/>
<slice name="Silicon_slice" material="Silicon" thickness="ffiZDCHcalSiliconThickness" vis="AnlRed" sensitive="true"/>
<slice name="Air_slice" material="Air" thickness="ffiZDCHcalAirThickness" vis="AnlGold"/>
</layer>
+ <layer repeat="ffi_ZDC_HCAL_PbScint_NRepeat">
+ <slice name="Lead_slice" material="Pb" thickness="ffiZDCHcalLeadThickness" vis="BlueGreenVis"/>
+ <slice name="Scint_slice" material="PlasticScint" thickness="ffiZDCHcalScintThickness" vis="AnlOrange" sensitive="true"/>
+ </layer>
</detector>
</detectors>
diff --git a/ip6/far_forward_detectors.xml b/ip6/far_forward_detectors.xml
index cc87c14..c85a075 100644
--- a/ip6/far_forward_detectors.xml
+++ b/ip6/far_forward_detectors.xml
@@ -8,7 +8,7 @@
Zero Degree Parameters
----------------------
</comment>
- <constant name="ffi_ZDC_ECAL_z_pos" value="3800.0 * cm"/>
+ <constant name="ffi_ZDC_ECAL_z_pos" value="3750.0 * cm"/>
<constant name="ffi_ZDC_ECAL_x_pos" value="ffi_ZDC_ECAL_z_pos * ionCrossingAngle"/>
<constant name="ffi_ZDC_ECAL_y_pos" value="0.0 * cm"/>
<constant name="ffi_ZDC_ECAL_rotateX_angle" value="0.0 * rad"/>
@@ -19,11 +19,11 @@
<constant name="ffi_ZDC_ECAL_module_gap" value="1.0 * mm"/>
<constant name="ffi_ZDC_ECAL_module_ntower" value="12"/>
<constant name="ffi_ZDC_ECAL_width" value="(ffi_ZDC_ECAL_module_width + ffi_ZDC_ECAL_module_gap) * ffi_ZDC_ECAL_module_ntower + 2.0 * cm"/>
- <constant name="ffi_ZDC_ECAL_thickness" value="ffi_ZDC_ECAL_module_thickness + 2.0 * cm"/>
+ <constant name="ffi_ZDC_ECAL_thickness" value="ffi_ZDC_ECAL_module_thickness + 1.0 * cm"/>
<constant name="ffi_ZDC_HCAL_x_pos" value="ffi_ZDC_ECAL_x_pos"/>
<constant name="ffi_ZDC_HCAL_y_pos" value="ffi_ZDC_ECAL_y_pos"/>
- <constant name="ffi_ZDC_HCAL_z_pos" value="ffi_ZDC_ECAL_z_pos + ffi_ZDC_ECAL_thickness + 3.0 * cm"/>
+ <constant name="ffi_ZDC_HCAL_z_pos" value="ffi_ZDC_ECAL_z_pos + ffi_ZDC_ECAL_thickness + 1.0 * cm"/>
<constant name="ffi_ZDC_HCAL_rotateX_angle" value="ffi_ZDC_ECAL_rotateX_angle"/>
<constant name="ffi_ZDC_HCAL_rotateY_angle" value="ffi_ZDC_ECAL_rotateY_angle"/>
<constant name="ffi_ZDC_HCAL_rotateZ_angle" value="ffi_ZDC_ECAL_rotateZ_angle"/>
--
GitLab