Cleanup parametrization in definition

ada7b6d8 · Sylvester Joosten · 69311a7e · ada7b6d8 · ada7b6d8 · ada7b6d8
Commit ada7b6d8 authored Aug 25, 2021 by Sylvester Joosten
--- a/compact/ci_ecal.xml
+++ b/compact/ci_ecal.xml
 <lccdd>
  <define>
-    <constant name="EcalEndcapP_rmax" value="Solenoid_rmax "/>
+
+    <constant name="EcalEndcapPSiliconThickness"       value="9.00 * mm" />
+    <constant name="EcalEndcapPCopperThickness"        value="0.05 * mm" />
+    <constant name="EcalEndcapPKaptonThickness"        value="0.30 * mm" />
+    <constant name="EcalEndcapPAir1Thickness"          value="0.33 * mm" />
+    <constant name="EcalEndcapPAir2Thickness"          value="0.25 * mm" />
+    <constant name="EcalEndcapPThinTungstenThickness"  value="2.50 * mm" />
+    <constant name="EcalEndcapPThickTungstenThickness" value="5.00 * mm" />
+    <constant name="EcalEndcapPLayer1_thickness"
+        value="EcalEndcapPSiliconThickness + EcalEndcapPCopperThickness + EcalEndcapPKaptonThickness + EcalEndcapPAir1Thickness"/>
+    <constant name="EcalEndcapPLayer2_thickness"   
+        value="EcalEndcapPThinTungstenThickness + EcalEndcapPAir2Thickness + EcalEndcapPSiliconThickness + EcalEndcapPCopperThickness + EcalEndcapPKaptonThickness + EcalEndcapPAir1Thickness"/>
+    <constant name="EcalEndcapPLayer3_thickness"   
+        value="EcalEndcapPThickTungstenThickness + EcalEndcapPAir2Thickness + EcalEndcapPSiliconThickness + EcalEndcapPCopperThickness + EcalEndcapPKaptonThickness + EcalEndcapPAir1Thickness"/>
+    <constant name="EcalEndcapPLayers" 
+        value="floor((EcalEndcapP_length - EcalEndcapPLayer1_thickness) / (EcalEndcapPLayer2_thickness + EcalEndcapPLayer3_thickness))"/>
+    <constant name="EcalEndcapPLayer1_NRepeat"      value="1"/>
+    <constant name="EcalEndcapPLayer2_NRepeat"      value="EcalEndcapPLayers"/>
+    <constant name="EcalEndcapPLayer3_NRepeat"      value="EcalEndcapPLayers"/>
+
+
+
  </define>


@@ -34,26 +55,26 @@
        rmin="EcalEndcapP_rmin" 
        rmax="EcalEndcapP_rmax " />
      <layer repeat="EcalEndcapPLayer1_NRepeat" vis="EcalEndcapLayerVis">
-        <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
-        <slice material="Copper" thickness="EcalCopperThickness"/>
-        <slice material="Kapton" thickness="EcalKaptonThickness"/>
-        <slice material="Air" thickness="EcalAir1Thickness"/>
+        <slice material="Silicon" thickness="EcalEndcapPSiliconThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Copper" thickness="EcalEndcapPCopperThickness"/>
+        <slice material="Kapton" thickness="EcalEndcapPKaptonThickness"/>
+        <slice material="Air" thickness="EcalEndcapPAir1Thickness"/>
      </layer>
      <layer repeat="EcalEndcapPLayer2_NRepeat" vis="EcalEndcapLayerVis">
-        <slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
-        <slice material="Air" thickness="EcalAir2Thickness"/>
-        <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
-        <slice material="Copper" thickness="EcalCopperThickness"/>
-        <slice material="Kapton" thickness="EcalKaptonThickness"/>
-        <slice material="Air" thickness="EcalAir1Thickness"/>
+        <slice material="TungstenDens24" thickness="EcalEndcapPThinTungstenThickness"/>
+        <slice material="Air" thickness="EcalEndcapPAir2Thickness"/>
+        <slice material="Silicon" thickness="EcalEndcapPSiliconThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Copper" thickness="EcalEndcapPCopperThickness"/>
+        <slice material="Kapton" thickness="EcalEndcapPKaptonThickness"/>
+        <slice material="Air" thickness="EcalEndcapPAir1Thickness"/>
      </layer>
      <layer repeat="EcalEndcapPLayer3_NRepeat" vis="EcalEndcapLayerVis">
-        <slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
-        <slice material="Air" thickness="EcalAir2Thickness"/>
-        <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
-        <slice material="Copper" thickness="EcalCopperThickness"/>
-        <slice material="Kapton" thickness="EcalKaptonThickness"/>
-        <slice material="Air" thickness="EcalAir1Thickness"/>
+        <slice material="TungstenDens24" thickness="EcalEndcapPThickTungstenThickness"/>
+        <slice material="Air" thickness="EcalEndcapPAir2Thickness"/>
+        <slice material="Silicon" thickness="EcalEndcapPSiliconThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Copper" thickness="EcalEndcapPCopperThickness"/>
+        <slice material="Kapton" thickness="EcalEndcapPKaptonThickness"/>
+        <slice material="Air" thickness="EcalEndcapPAir1Thickness"/>
      </layer>
    </detector>
  </detectors>

--- a/compact/definitions.xml
+++ b/compact/definitions.xml
--- a/compact/display_geoviewer.xml
+++ b/compact/display_geoviewer.xml
@@ -66,7 +66,7 @@
    <vis name="DIRCVis"         ref="AnlTeal"       showDaughters="true" visible="true"/>
    <vis name="DIRCLayerVis"    ref="AnlTeal"       showDaughters="false" visible="true"/>
    <vis name="DIRCModuleVis"   ref="AnlTeal"       showDaughters="true" visible="true"/>
-    <vis name="DIRCSupportVis"  ref="AnlGray" showDaughters="true" visible="true"/>
+    <vis name="DIRCSupportVis"  ref="AnlTeal"       showDaughters="true" visible="true"/>
    <vis name="DIRCFrameVis"    ref="AnlOrange"     showDaughters="true" visible="true"/>
    <vis name="DIRCBarVis"      ref="AnlTeal"       showDaughters="true" visible="true"/>


--- a/compact/drich.xml
+++ b/compact/drich.xml
@@ -9,7 +9,7 @@
    <constant name="DRICH_scale"              value="0.963"/> <!-- overall scale factor from fun4all to ATHENA -->
    <constant name="DRICH_f4a_length"         value="161.0*cm"/> <!-- z-length of fun4all design -->
    <!-- vessel (=snout+tank) geometry -->
-    <constant name="DRICH_zmin"               value="CentralTrackingHalfP_length"/> <!-- vessel front -->
+    <constant name="DRICH_zmin"               value="ForwardPID_zmin"/> <!-- vessel front -->
    <constant name="DRICH_Length"             value="ForwardPID_length"/>  <!-- overall vessel length (including snout) -->
    <constant name="DRICH_rmin0"              value="ForwardPID_rmin1"/>  <!-- bore radius at dRICh vessel frontplane -->
    <constant name="DRICH_rmin1"              value="19.0*cm"/>  <!-- bore radius at dRICh vessel backplane -->

--- a/compact/ecal_barrel.xml
+++ b/compact/ecal_barrel.xml
@@ -21,7 +21,7 @@
    <constant name="EcalBarrel_ModRepeat"            value="CaloSides"/> 
    <constant name="EcalBarrel_ModLength"            value="0.5*m"/>
    <constant name="EcalBarrel_ModWidth"             value="0.5*m"/>
-    <constant name="EcalBarrel_AvailThickness"       value="EcalBarrel_TotalThickness-EcalBarrel_Support_thickness"/>
+    <constant name="EcalBarrel_AvailThickness"       value="EcalBarrelEnvelope_thickness-EcalBarrel_Support_thickness"/>
    <constant name="EcalBarrel_ReadoutLayerThickness"
      value="EcalBarrel_SiliconThickness
      + EcalBarrel_ElectronicsThickness

--- a/compact/ecal_barrel_hybrid.xml
+++ b/compact/ecal_barrel_hybrid.xml
@@ -32,7 +32,7 @@
    <constant name="EcalBarrel_ModRepeat"            value="CaloSides"/> 
    <constant name="EcalBarrel_ModLength"            value="0.5*m"/>
    <constant name="EcalBarrel_ModWidth"             value="0.5*m"/>
-    <constant name="EcalBarrel_AvailThickness"       value="EcalBarrel_TotalThickness-EcalBarrel_Support_thickness"/>
+    <constant name="EcalBarrel_AvailThickness"       value="EcalBarrelEnvelope_thickness-EcalBarrel_Support_thickness"/>
    <constant name="EcalBarrel_ImagingLayerThickness"
      value="EcalBarrel_SiliconThickness
      + EcalBarrel_ElectronicsThickness

--- a/compact/ecal_barrel_interlayers.xml
+++ b/compact/ecal_barrel_interlayers.xml
@@ -30,7 +30,7 @@
    <constant name="EcalBarrel_ModRepeat"            value="CaloSides"/>
    <constant name="EcalBarrel_ModLength"            value="0.5*m"/>
    <constant name="EcalBarrel_ModWidth"             value="0.5*m"/>
-    <constant name="EcalBarrel_AvailThickness"       value="EcalBarrel_TotalThickness-EcalBarrel_Support_thickness"/>
+    <constant name="EcalBarrel_AvailThickness"       value="EcalBarrelEnvelope_thickness-EcalBarrel_Support_thickness"/>
    <constant name="EcalBarrel_ImagingLayerThickness"
      value="EcalBarrel_SiliconThickness
      + EcalBarrel_ElectronicsThickness

--- a/compact/gem_tracker_endcap.xml
+++ b/compact/gem_tracker_endcap.xml
@@ -5,8 +5,8 @@
  <define>
    <constant name="GEMTrackerEndcapP_thickness"      value="min(10.0*cm,ForwardTracking_length)" />
    <constant name="GEMTrackerEndcapN_thickness"      value="min(10.0*cm,BackwardTracking_length)" />
-    <constant name="GEMTrackerEndcapP_zmin"           value="CentralTrackingHalfP_length + ForwardPID_length"/>
-    <constant name="GEMTrackerEndcapN_zmin"           value="CentralTrackingHalfN_length + BackwardPID_length"/>
+    <constant name="GEMTrackerEndcapP_zmin"           value="ForwardTracking_zmin"/>
+    <constant name="GEMTrackerEndcapN_zmin"           value="BackwardTracking_zmin"/>
    <constant name="GEMTrackerEndcapP_rmin"           value="19*cm" />
    <constant name="GEMTrackerEndcapN_rmin"           value="10*cm" />
    <constant name="GEMTrackerEndcapP_rmax"           value="200*cm" />

--- a/compact/hcal.xml
+++ b/compact/hcal.xml
@@ -2,6 +2,42 @@

  <define>
    <constant name="HcalBarrel_offset"              value="(HcalEndcapP_zmin-HcalEndcapN_zmin)/2.0" />
+
+    <constant name="HcalBarrelAvailThickness" value="HcalBarrel_thickness"/>
+    <documentation>
+      #### Material Thickness 
+    </documentation>
+    <constant name="HcalBarrelSteelThickness"        value="2.0 * cm"/>
+    <constant name="HcalBarrelPolystyreneThickness"  value="0.5 * cm"/>
+    <constant name="HcalEndcapNSteelThickness"       value="HcalBarrelSteelThickness"/>
+    <constant name="HcalEndcapNPolystyreneThickness" value="HcalBarrelPolystyreneThickness"/>
+    <constant name="HcalEndcapPSteelThickness"       value="HcalBarrelSteelThickness"/>
+    <constant name="HcalEndcapPPolystyreneThickness" value="0.3 * cm"/>
+
+    <documentation>
+      - Hcal Barrel Layers and computed Thickness
+    </documentation>
+    <constant name="HcalBarrelSingleLayerThickness"
+             value="HcalBarrelSteelThickness + HcalBarrelPolystyreneThickness"/>
+    <constant name="HcalBarrelLayer_NRepeat" value="floor(HcalBarrelAvailThickness / HcalBarrelSingleLayerThickness)"/>
+    <constant name="HcalBarrelThickness" value="HcalBarrelLayer_NRepeat * HcalBarrelSingleLayerThickness"/>
+
+    <documentation>
+      - Hcal Endcap N Layers and computed Thickness
+    </documentation>
+    <constant name="HcalEndcapNSingleLayerThickness"
+             value="HcalEndcapNSteelThickness + HcalEndcapNPolystyreneThickness"/>
+    <constant name="HcalEndcapNLayer_NRepeat" value="floor(HcalEndcapN_length / HcalEndcapNSingleLayerThickness)"/>
+    <constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalEndcapNSingleLayerThickness"/>
+
+    <documentation>
+      - Hcal Endcap P Layers and computed Thickness
+    </documentation>
+    <constant name="HcalEndcapPSingleLayerThickness"
+             value="HcalEndcapPSteelThickness + HcalEndcapPPolystyreneThickness"/>
+    <constant name="HcalEndcapPLayer_NRepeat" value="floor(HcalEndcapP_length / HcalEndcapPSingleLayerThickness)"/>
+    <constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalEndcapPSingleLayerThickness"/>
+
  </define>

  <limits>
@@ -29,7 +65,7 @@
      <dimensions 
        numsides="CaloSides" 
        rmin="HcalBarrel_rmin" 
-        z="HcalBarrelLength"/>
+        z="HcalBarrel_length"/>
      <staves vis="HcalBarrelStaveVis"/>
      <layer repeat="HcalBarrelLayer_NRepeat" vis="HcalBarrelLayerVis">
        <slice material="Steel235" thickness="HcalBarrelSteelThickness" vis="HcalAbsorberVis"/>

--- a/compact/mrich.xml
+++ b/compact/mrich.xml
@@ -4,7 +4,7 @@
    <constant name="MRICH_rmin"   value="10*cm"/>
    <constant name="MRICH_rmax"   value="BackwardPID_rmax"/>
    <constant name="MRICH_length" value="BackwardPID_length"/>
-    <constant name="MRICH_zmin"   value="CentralTrackingHalfN_length"/>
+    <constant name="MRICH_zmin"   value="BackwardPID_zmin"/>

    <constant name="MRICHAerogel_thickness"           value="30.0*mm"/>
    <constant name="MRICHAerogel_width"               value="126.5*mm"/>