Revert "make material in 1st layer of ECAL absorber configurable. Set…

… by default to G10 rather than LAr. Also add more comments and fix some whitespaces" This reverts commit 33615be.
key4hep · Nov 8, 2024 · cb1da09 · cb1da09
1 parent 3e94e49
commit cb1da09
Show file tree

Hide file tree

Showing 4 changed files with 172 additions and 242 deletions.
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ECalBarrel_thetamodulemerged.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ECalBarrel_thetamodulemerged.xml
@@ -126,11 +126,11 @@
         </active>
         <passive>
           <rotation angle="InclinationAngle"/>  <!-- inclination angle -->
-          <inner thickness="Pb_thickness" sensitive="false"> <!-- thickness of inner part of the absorber, at Rmin, and whether its is active in layer 1 -->
-            <material name="G10"/> <!-- material of the inner part of the absorber, in the first layer of the calorimeter -->
+          <inner thickness="Pb_thickness" sensitive="false">
+            <material name="Lead"/>
           </inner>
-          <innerMax thickness="Pb_thickness_max" sensitive="false"> <!-- thickness of the inner part of the absorber, at Rmax, and whether its is active in layers 2-N -->
-            <material name="Lead"/> <!-- material of the inner part of the absorber, in the other layers (2-N) of the calorimeter -->
+          <innerMax thickness="Pb_thickness_max" sensitive="false">
+            <material name="Lead"/>
           </innerMax>
           <glue thickness="Glue_thickness" sensitive="false">
             <material name="lArCaloGlue"/>

diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ECalBarrel_thetamodulemerged_calibration.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ECalBarrel_thetamodulemerged_calibration.xml
@@ -118,11 +118,11 @@
         </active>
         <passive>
           <rotation angle="InclinationAngle"/>  <!-- inclination angle -->
-          <inner thickness="Pb_thickness" sensitive="true"> <!-- thickness of inner part of the absorber, at Rmin, and whether its is active in layer 1 -->
-            <material name="G10"/> <!-- material of the inner part of the absorber, in the first layer of the calorimeter -->
+          <inner thickness="Pb_thickness" sensitive="true">
+            <material name="Lead"/>
           </inner>
-          <innerMax thickness="Pb_thickness_max" sensitive="true"> <!-- thickness of the inner part of the absorber, at Rmax, and whether its is active in layers 2-N -->
-            <material name="Lead"/> <!-- material of the inner part of the absorber, in the other layers (2-N) of the calorimeter -->
+          <innerMax thickness="Pb_thickness_max" sensitive="true">
+            <material name="Lead"/>
           </innerMax>
           <glue thickness="Glue_thickness" sensitive="true">
             <material name="lArCaloGlue"/>

diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ECalBarrel_thetamodulemerged_upstream.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ECalBarrel_thetamodulemerged_upstream.xml
@@ -118,11 +118,11 @@
         </active>
         <passive>
           <rotation angle="InclinationAngle"/>  <!-- inclination angle -->
-          <inner thickness="Pb_thickness" sensitive="false"> <!-- thickness of inner part of the absorber, at Rmin, and whether its is active in layer 1 -->
-            <material name="G10"/> <!-- material of the inner part of the absorber, in the first layer of the calorimeter -->
+          <inner thickness="Pb_thickness" sensitive="false">
+            <material name="Lead"/>
           </inner>
-          <innerMax thickness="Pb_thickness_max" sensitive="false"> <!-- thickness of the inner part of the absorber, at Rmax, and whether its is active in layers 2-N -->
-            <material name="Lead"/> <!-- material of the inner part of the absorber, in the other layers (2-N) of the calorimeter -->
+          <innerMax thickness="Pb_thickness_max" sensitive="false">
+            <material name="Lead"/>
           </innerMax>
           <glue thickness="Glue_thickness" sensitive="false">
             <material name="lArCaloGlue"/>