From aed4c8d1c6746785a676b6225f67daae9685d511 Mon Sep 17 00:00:00 2001
From: Marshall Scott <mbscott@anl.gov>
Date: Mon, 12 Apr 2021 13:57:01 -0400
Subject: [PATCH] Changed things after rebasing
---
compact/ci_GEM.xml | 11 +++++-
compact/ci_HCAL.xml | 9 ++++-
compact/definitions.xml | 83 ++++++++++++++++++-----------------------
compact/materials.xml | 7 ----
reference_detector.xml | 17 ++-------
5 files changed, 57 insertions(+), 70 deletions(-)
diff --git a/compact/ci_GEM.xml b/compact/ci_GEM.xml
index 6496579..f564d86 100644
--- a/compact/ci_GEM.xml
+++ b/compact/ci_GEM.xml
@@ -42,9 +42,9 @@
<comment>
Central Ion GEM
</comment>
- <detector id="ci_GEM_id" name="ci_GEM" type="ci_GEM" insideTrackingVolume="false" vis="ci_GEMVis">
+ <detector id="ci_GEM_id" name="ci_GEM" type="ci_GEM" insideTrackingVolume="false" vis="ci_GEMVis" readout="ci_GEM_Hits">
<material name="Ar10CO2"/>
- <dimensions rmin="ci_GEM_rin" rmax="ci_GEM_rout" z_length="ci_GEM_sizez" z_offset="ci_GEM_shiftz" z="ci_GEM_posz" x="ci_GEM_posx" number="ci_GEM_nlayers" rmax1="ci_HCAL_lay_rin -1. * cm"/>
+ <dimensions rmin="ci_GEM_rin" rmax="ci_GEM_rout" z_length="ci_GEM_sizez" z_offset="ci_GEM_shiftz" z="ci_GEM_posz" x="ci_GEM_posx" number="ci_GEM_nlayers" rmax1="ci_HCAL_lay_rin -1*cm"/>
<layer id="0" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 0) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 0) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 0) * cm" dz="1 * cm" />
<layer id="1" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 1) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 1) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 1) * cm" dz="1 * cm" />
<layer id="2" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 2) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 2) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 2) * cm" dz="1 * cm" />
@@ -55,6 +55,13 @@
<layer id="7" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 7) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 7) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 7) * cm" dz="1 * cm" />
</detector>
</detectors>
+ <readouts>
+ <readout name="ci_GEM_Hits">
+ <segmentation type="CartesianGridXY" grid_size_x="1.0*mm" grid_size_y="1.0*mm" />
+ <id>system:8,layer:8,x:32:-16,y:-16</id>
+ </readout>
+ </readouts>
+
<plugins>
</plugins>
diff --git a/compact/ci_HCAL.xml b/compact/ci_HCAL.xml
index 923be2c..65589d6 100644
--- a/compact/ci_HCAL.xml
+++ b/compact/ci_HCAL.xml
@@ -28,7 +28,7 @@
<comment>
Central Ion HCAL
</comment>
- <detector id="ci_HCAL_id" name="ci_HCAL" type="ci_HCAL" insideTrackingVolume="false" vis="ci_HCALVis">
+ <detector id="ci_HCAL_id" name="ci_HCAL" type="ci_HCAL" insideTrackingVolume="false" vis="ci_HCALVis" readout="ci_HCAL_Hits">
<material name="Iron"/>
<dimensions rmin="ci_HCAL_rin" rmax="ci_HCAL_rout" z_length="ci_HCAL_sizez" z_offset="ci_HCAL_shiftz" z="ci_HCAL_posz" x="ci_HCAL_posx" number="ci_HCAL_nlayers" rmin1="ci_HCAL_lay_rin" rmax1="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness"/>
<layer id="0" z="-ci_HCAL_sizez * 0.5 + (1 + 0) * ci_HCAL_lay_thickness + (1 + 0) * 5 * cm" inner_r="ci_HCAL_lay_rin" outer_r="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness" />
@@ -53,6 +53,13 @@
<layer id="19" z="-ci_HCAL_sizez * 0.5 + (1 + 19) * ci_HCAL_lay_thickness + (1 + 19) * 5 * cm" inner_r="ci_HCAL_lay_rin" outer_r="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness" />
</detector>
</detectors>
+ <readouts>
+ <readout name="ci_HCAL_Hits">
+ <segmentation type="CartesianGridXY" grid_size_x="1.0*mm" grid_size_y="1.0*mm" />
+ <id>system:8,layer:8,x:32:-16,y:-16</id>
+ </readout>
+ </readouts>
+
<plugins>
</plugins>
diff --git a/compact/definitions.xml b/compact/definitions.xml
index d06f7ab..c9d0e7d 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -26,7 +26,7 @@
endcapP/endcapN are the endcaps at positive/negative z values.
See https://acts.readthedocs.io/en/latest/plugins/dd4hep.html for more details.
- The tracking geometry needs to be constructed from cylinders from the inside out. For this reason
+ The tracking geometry needs to beconstructed from cylinders from the inside out. For this reason
each layer needs its own subsystem assembly. This increases the number of top level system IDs.
For example the silicon tracker needs 3 IDs for each area (endcap+barrel+endcap) and a subassembly for each
layer. Therefore it needs a minimum of 20 IDs. Therefore we will allocate blocks of ~25 for each major subsystem.
@@ -127,7 +127,7 @@
<comment>
===================
- (75-99) Reserved IDs
+ (75-99 Reserved IDs
===================
Unused IDs: 75-99
@@ -156,7 +156,7 @@
<comment>
=====================================
- (110-119) Hadronic Calorimeter
+ (110-119Hadronic Calorimeter
=====================================
HCal subsystem ID: 110
@@ -413,7 +413,7 @@
</comment>
<constant name="CaloSides" value="12"/>
-
+
<comment>Material Thickness</comment>
<constant name="EcalSiliconThickness" value="9.00 * mm" />
<constant name="EcalCopperThickness" value="0.05 * mm" />
@@ -422,32 +422,32 @@
<constant name="EcalAir2Thickness" value="0.25 * mm" />
<constant name="EcalThinTungstenThickness" value="2.50 * mm" />
<constant name="EcalThickTungstenThickness" value="5.00 * mm" />
-
+
<comment> Layer Thickness </comment>
<constant name="EcalLayer1_thickness"
- value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
+ value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<constant name="EcalLayer2_thickness"
- value="EcalThinTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
+ value="EcalThinTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<constant name="EcalLayer3_thickness"
- value="EcalThickTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
-
+ value="EcalThickTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
+
<comment> EM Barrel N Layer; same number of layers for EcalThin and EcalThick</comment>
<constant name="EcalBarrelLayers"
- value="floor((EcalBarrel_TotalThickness - EcalLayer1_thickness) / (EcalLayer2_thickness + EcalLayer3_thickness))"/>
+ value="floor((EcalBarrel_TotalThickness - EcalLayer1_thickness) / (EcalLayer2_thickness + EcalLayer3_thickness))"/>
<constant name="EcalBarrelLayer1_NRepeat" value="1"/>
<constant name="EcalBarrelLayer2_NRepeat" value="EcalBarrelLayers"/>
<constant name="EcalBarrelLayer3_NRepeat" value="EcalBarrelLayers"/>
<comment> EM Barrel Thickness </comment>
<constant name="EcalBarrelThickness"
- value="EcalBarrelLayer1_NRepeat*EcalLayer1_thickness + EcalBarrelLayer2_NRepeat * EcalLayer2_thickness + EcalBarrelLayer3_NRepeat * EcalLayer3_thickness"/>
+ value="EcalBarrelLayer1_NRepeat*EcalLayer1_thickness + EcalBarrelLayer2_NRepeat * EcalLayer2_thickness + EcalBarrelLayer3_NRepeat * EcalLayer3_thickness"/>
<constant name="EcalBarrel_rmax" value="EcalBarrel_rmin + EcalBarrelThickness"/>
<comment> EM Endcap N Layer; same number of layers for EcalThin and EcalThick </comment>
<constant name="EcalEndcapPLayers"
- value="floor((EcalEndcapP_TotalThickness - EcalLayer1_thickness) / (EcalLayer2_thickness + EcalLayer3_thickness))"/>
+ value="floor((EcalEndcapP_TotalThickness - EcalLayer1_thickness) / (EcalLayer2_thickness + EcalLayer3_thickness))"/>
<constant name="EcalEndcapNLayers"
- value="floor((EcalEndcapN_TotalThickness - EcalLayer1_thickness) / (EcalLayer2_thickness + EcalLayer3_thickness))"/>
+ value="floor((EcalEndcapN_TotalThickness - EcalLayer1_thickness) / (EcalLayer2_thickness + EcalLayer3_thickness))"/>
<constant name="EcalEndcapPLayer1_NRepeat" value="1"/>
<constant name="EcalEndcapNLayer1_NRepeat" value="1"/>
<constant name="EcalEndcapPLayer2_NRepeat" value="EcalEndcapPLayers"/>
@@ -457,9 +457,9 @@
<comment> EM Endcap Thickness </comment>
<constant name="EcalEndcapPThickness"
- value="EcalEndcapPLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapPLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapPLayer3_NRepeat*EcalLayer3_thickness "/>
+ value="EcalEndcapPLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapPLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapPLayer3_NRepeat*EcalLayer3_thickness "/>
<constant name="EcalEndcapNThickness"
- value="EcalEndcapNLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapNLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapNLayer3_NRepeat*EcalLayer3_thickness"/>
+ value="EcalEndcapNLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapNLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapNLayer3_NRepeat*EcalLayer3_thickness"/>
<comment>
@@ -482,8 +482,8 @@
<comment> Layer Thickness </comment>
<constant name="HcalOneLayerThickness"
- value="HcalSteelThickness + (2 * HcalPyrexThickness) + HcalRPCGasThickness + HcalG10Thickness + HcalAirThickness"/>
-
+ value="HcalSteelThickness + (2 * HcalPyrexThickness) + HcalRPCGasThickness + HcalG10Thickness + HcalAirThickness"/>
+
<comment> H Barrel Layers and Thickness </comment>
<constant name="HcalBarrelLayers" value="floor(HcalBarrelAvailThickness / HcalOneLayerThickness)"/>
<constant name="HcalBarrelThickness" value="HcalBarrelLayers * HcalOneLayerThickness"/>
@@ -518,17 +518,17 @@
<comment> Global parameters </comment>
<constant name="ffi_ZDC_width" value="60.0 * cm"/>
<constant name="ffi_ZDC_thickness" value="200.0 * cm"/>
- <comment> Original Global parameters </comment>
+ <comment> Original Global parameters </comment>
<!--
<constant name="ffi_ZDC_thickness" value="250.0 * cm"/>
- -->
+ -->
<constant name="ffi_ZDC_ECAL_thickness" value="30.0 * cm"/>
<constant name="ffi_ZDC_ECAL_inner_radius" value="0.0 * cm"/>
<constant name="ffi_ZDC_ECAL_outer_radius" value="60.0 * cm"/>
<constant name="ffi_ZDC_ECAL_width" value="5.0 * cm"/>
<constant name="ffi_ZDC_ECAL_gap" value="5.0 * mm"/>
<constant name="ffi_ZDC_ECAL_ntower" value="10"/>
- <comment> Original number of towers parameter </comment>
+ <comment> Original number of towers parameter </comment>
<!--
<constant name="ffi_ZDC_ECAL_ntower" value="20"/>
-->
@@ -570,16 +570,26 @@
ce_MRICH Parameters
--------------------------
</comment>
-<<<<<<< HEAD
<constant name="ce_MRICHRMin" value="15*cm"/>
<constant name="ce_MRICHRMax" value="100*cm"/>
<constant name="ce_MRICHLength" value="BackwardCherenkovLength"/>
<constant name="ce_MRICHZMin" value="-EcalEndcapN_zmin+ce_MRICHLength"/>
-=======
- <constant name="ce_MRICHRMin" value="15*cm"/>
- <constant name="ce_MRICHRMax" value="100*cm"/>
- <constant name="ce_MRICHLength" value="15*cm"/>
- <constant name="ce_MRICHZMin" value="-EcalEndcap_zmin+10.*cm"/>
+
+ <comment>
+ ------------------
+ ce_GEM Parameters
+ ------------------
+ </comment>
+ <constant name="ce_GEM_rmin" value="5.0 * cm"/> <comment> temporary number. Need beampipe radius </comment>
+ <!--<constant name="ce_GEM_rmin" value="0.0 * cm"/>-->
+ <constant name="ce_GEM_rmax" value="HcalEndcapN_rmin + 8.0 * cm"/> <comment> temporary number to avoid overlaps </comment>
+ <!--<constant name="ce_GEM_rmax" value="45.0 * cm + 50.0 * cm"/>-->
+ <constant name="ce_GEM_length" value="30.0 * cm"/>
+ <constant name="ce_GEM_x_pos" value="0.0 * cm"/>
+ <constant name="ce_GEM_y_pos" value="0.0 * cm"/>
+ <constant name="ce_GEM_z_pos" value="-Solenoid_length/2.0 + ce_GEM_length/2.0"/>
+ <constant name="ce_GEM_layer" value="8"/>
+ <constant name="ce_GEM_layer_thickness" value="1.0 * cm"/>
<comment>
--------------------------
@@ -588,7 +598,7 @@
</comment>
<constant name="ci_HCAL_id" value="200"/>
- <constant name="ci_HCAL_rin" value="SolenoidBarrel_rmax + 1 * cm"/><!-- Original = 0cm -->
+ <constant name="ci_HCAL_rin" value="225 * cm"/><!-- Original = 0cm -->
<constant name="ci_HCAL_rout" value="300 * cm"/>
<constant name="ci_HCAL_sizez" value="160 * cm"/>
<constant name="ci_HCAL_shiftz" value="5 * cm"/>
@@ -615,24 +625,5 @@
<constant name="ci_GEM_nlayers" value="8"/>
-
->>>>>>> 57cf00b (Changed .xml files and ci_GEM.cpp)
-
- <comment>
- ------------------
- ce_GEM Parameters
- ------------------
- </comment>
- <constant name="ce_GEM_rmin" value="7.0 * cm"/> <comment> temporary number. Need beampipe radius </comment>
- <!--<constant name="ce_GEM_rmin" value="0.0 * cm"/>-->
- <constant name="ce_GEM_rmax" value="HcalEndcapN_rmin + 8.0 * cm"/> <comment> temporary number to avoid overlaps </comment>
- <!--<constant name="ce_GEM_rmax" value="45.0 * cm + 50.0 * cm"/>-->
- <constant name="ce_GEM_length" value="30.0 * cm"/>
- <constant name="ce_GEM_x_pos" value="0.0 * cm"/>
- <constant name="ce_GEM_y_pos" value="0.0 * cm"/>
- <constant name="ce_GEM_z_pos" value="-Solenoid_length/2.0 + ce_GEM_length/2.0"/>
- <constant name="ce_GEM_layer" value="8"/>
- <constant name="ce_GEM_layer_thickness" value="1.0 * cm"/>
-
</define>
diff --git a/compact/materials.xml b/compact/materials.xml
index 2a6857a..d8955f0 100644
--- a/compact/materials.xml
+++ b/compact/materials.xml
@@ -185,13 +185,6 @@
<composite n="1" ref="W"/>
<composite n="4" ref="O"/>
</material>
- <material name="Ar10CO2">
- <D type="density" value="1.802e-3" unit="g / cm3"/>
- <composite n="10" ref="Ar"/>
- <composite n="1" ref="C"/>
- <composite n="2" ref="O"/>
- </material>
-
<material name="Ar10CO2">
<D type="density" value="1.802" unit="mg / cm3"/>
<composite n="0.891" ref="Argon"/>
diff --git a/reference_detector.xml b/reference_detector.xml
index 9f0b2a0..da5aecb 100644
--- a/reference_detector.xml
+++ b/reference_detector.xml
@@ -114,33 +114,22 @@
<include ref="reference_detector/vertex_tracker.xml"/>
<include ref="compact/silicon_tracker.xml"/>
-->
- <!--
<include ref="ip6/beampipe.xml"/>
- -->
<include ref="compact/solenoid.xml"/>
-
- <!--
<include ref="compact/ecal.xml"/>
<include ref="compact/cb_CTD_Si.xml"/>
<include ref="compact/ce_mrich.xml"/>
<include ref="compact/ce_GEM.xml"/>
<include ref="compact/ffi_ZDC.xml"/>
- -->
+ <include ref="compact/ci_HCAL.xml"/>
+ <include ref="compact/ci_GEM.xml"/>
+
<!--
<include ref="compact/forward_rich.xml"/>
<include ref="compact/hcal.xml"/>
- -->
- <include ref="compact/ci_HCAL.xml"/>
- <!--
- <include ref="compact/ci_GEM.xml"/>
- -->
-
- <!--
<include ref="compact/roman_pots.xml"/>
-->
-<!--
<include ref="eic/forward_ion_beamline.xml"/>
--->
<detectors>
--
GitLab