From adea07851e3197c6dd87f4a7ff0d809b9b78b566 Mon Sep 17 00:00:00 2001
From: "jihee.kim" <jihee.kim@anl.gov>
Date: Tue, 16 Feb 2021 17:26:50 -0600
Subject: [PATCH 1/3] EM barrel thickness can be calculated by adding up layers

---
 topside/topside_defs.xml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/topside/topside_defs.xml b/topside/topside_defs.xml
index f2a799d..70585d2 100644
--- a/topside/topside_defs.xml
+++ b/topside/topside_defs.xml
@@ -211,16 +211,7 @@
       -------------------------
     </comment>
     <constant name="CaloSides"                  value="12"/>
-    <constant name="EcalBarrelThickness"        value="250.0*mm"/>
-    <constant name="EcalBarrel_rmin"            value="SiliconTrackerOuterRadius+3.0*cm"/>
-    <constant name="EcalBarrel_rmax"            value="EcalBarrel_rmin + EcalBarrelThickness"/>
-    <constant name="EcalBarrelLength"           value="SiliconTrackerOuterBarrelLength+50.0*cm"/>
-
-    <constant name="EcalEndcap_zmin"            value="EcalBarrelLength/2.0"/>
-    <constant name="EcalEndcapThickness"        value="EcalBarrelThickness"/>
-    <constant name="EcalEndcapP_rmin"           value="250.0*mm"/>
-    <constant name="EcalEndcapN_rmin"           value="350.0*mm"/>
-
+    
     <constant name="EcalThinLayers"             value="10"/>
     <constant name="EcalThickLayers"            value="10"/>
     <constant name="EcalSiliconThickness"       value="0.32 * mm"/>
@@ -231,6 +222,22 @@
     <constant name="EcalThinTungstenThickness"  value="2.5 * mm"/>
     <constant name="EcalThickTungstenThickness" value="10 * mm"/>
 
+    <constant name="EcalBarrelFixedThickness"   
+	    value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness + EcalAir2Thickness"/>
+    <constant name="EcalBarrelThickness"
+	    value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness + 
+	    (EcalThinLayers * (EcalBarrelFixedThickness + EcalThinTungstenThickness)) + 
+	    (EcalThickLayers * (EcalBarrelFixedThickness + EcalThickTungstenThickness))"/>
+    
+    <constant name="EcalBarrel_rmin"            value="SiliconTrackerOuterRadius+3.0*cm"/>
+    <constant name="EcalBarrel_rmax"            value="EcalBarrel_rmin + EcalBarrelThickness"/>
+    <constant name="EcalBarrelLength"           value="SiliconTrackerOuterBarrelLength+50.0*cm"/>
+
+    <constant name="EcalEndcap_zmin"            value="EcalBarrelLength/2.0"/>
+    <constant name="EcalEndcapThickness"        value="EcalBarrelThickness"/>
+    <constant name="EcalEndcapP_rmin"           value="250.0*mm"/>
+    <constant name="EcalEndcapN_rmin"           value="350.0*mm"/>
+
     <comment>
       -------------------------------
       Hadronic Calorimeter Parameters
-- 
GitLab


From 19711d70670131de02a5c981d0f1f18a1c625e36 Mon Sep 17 00:00:00 2001
From: "jihee.kim" <jihee.kim@anl.gov>
Date: Tue, 16 Feb 2021 17:30:34 -0600
Subject: [PATCH 2/3] Rename constant to be clear

---
 topside/topside_defs.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/topside/topside_defs.xml b/topside/topside_defs.xml
index 70585d2..d4a7485 100644
--- a/topside/topside_defs.xml
+++ b/topside/topside_defs.xml
@@ -222,12 +222,12 @@
     <constant name="EcalThinTungstenThickness"  value="2.5 * mm"/>
     <constant name="EcalThickTungstenThickness" value="10 * mm"/>
 
-    <constant name="EcalBarrelFixedThickness"   
+    <constant name="EcalBarrelFixedLayersThickness"   
 	    value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness + EcalAir2Thickness"/>
     <constant name="EcalBarrelThickness"
 	    value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness + 
-	    (EcalThinLayers * (EcalBarrelFixedThickness + EcalThinTungstenThickness)) + 
-	    (EcalThickLayers * (EcalBarrelFixedThickness + EcalThickTungstenThickness))"/>
+	    (EcalThinLayers * (EcalBarrelFixedLayersThickness + EcalThinTungstenThickness)) + 
+	    (EcalThickLayers * (EcalBarrelFixedLayersThickness + EcalThickTungstenThickness))"/>
     
     <constant name="EcalBarrel_rmin"            value="SiliconTrackerOuterRadius+3.0*cm"/>
     <constant name="EcalBarrel_rmax"            value="EcalBarrel_rmin + EcalBarrelThickness"/>
-- 
GitLab


From b2fa8c7a4eb4284a0d514f084faeaf52140954f5 Mon Sep 17 00:00:00 2001
From: "jihee.kim" <jihee.kim@anl.gov>
Date: Tue, 16 Feb 2021 17:43:41 -0600
Subject: [PATCH 3/3] Fixed order of materials as in ecal.xml

---
 topside/topside_defs.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/topside/topside_defs.xml b/topside/topside_defs.xml
index d4a7485..d6f0d4c 100644
--- a/topside/topside_defs.xml
+++ b/topside/topside_defs.xml
@@ -223,11 +223,12 @@
     <constant name="EcalThickTungstenThickness" value="10 * mm"/>
 
     <constant name="EcalBarrelFixedLayersThickness"   
-	    value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness + EcalAir2Thickness"/>
+	    value="EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
+    
     <constant name="EcalBarrelThickness"
 	    value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness + 
-	    (EcalThinLayers * (EcalBarrelFixedLayersThickness + EcalThinTungstenThickness)) + 
-	    (EcalThickLayers * (EcalBarrelFixedLayersThickness + EcalThickTungstenThickness))"/>
+	    (EcalThinLayers * (EcalThinTungstenThickness + EcalBarrelFixedLayersThickness)) + 
+	    (EcalThickLayers * (EcalThickTungstenThickness + EcalBarrelFixedLayersThickness))"/>
     
     <constant name="EcalBarrel_rmin"            value="SiliconTrackerOuterRadius+3.0*cm"/>
     <constant name="EcalBarrel_rmax"            value="EcalBarrel_rmin + EcalBarrelThickness"/>
-- 
GitLab