From ede56e5c1b1b28b5a787bb4f44a642b846c3a6f3 Mon Sep 17 00:00:00 2001
From: Jana <jana.faltova@cern.ch>
Date: Wed, 27 Nov 2024 18:00:08 +0100
Subject: [PATCH] fixing LAr_ECalBarrel.xml

---
 FCCee/CLD/compact/CLD_o4_v05/LAr_ECalBarrel.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/FCCee/CLD/compact/CLD_o4_v05/LAr_ECalBarrel.xml b/FCCee/CLD/compact/CLD_o4_v05/LAr_ECalBarrel.xml
index 6121afe66..197bf574c 100644
--- a/FCCee/CLD/compact/CLD_o4_v05/LAr_ECalBarrel.xml
+++ b/FCCee/CLD/compact/CLD_o4_v05/LAr_ECalBarrel.xml
@@ -45,13 +45,13 @@
     <constant name="LArBathThicknessBack" value="40*mm"/>
 
     <!-- air margin around calorimeter -->
-    <constant name="BarCryoECal_rmin" value="BarECal_rmin+AirMarginThickness"/>
-    <constant name="BarCryoECal_rmax" value="BarECal_rmax-AirMarginThickness"/>
-    <constant name="BarCryoECal_dz" value="BarECal_dz"/>
+    <constant name="BarCryoECal_rmin" value="ECalBarrel_inner_radius+AirMarginThickness"/>
+    <constant name="BarCryoECal_rmax" value="ECalBarrel_outer_radius-AirMarginThickness"/>
+    <constant name="BarCryoECal_dz" value="ECalBarrel_half_length"/>
     <!-- calorimeter active volume -->
     <constant name="EMBarrel_rmin" value="BarCryoECal_rmin+CryoBarrelFront+LArBathThicknessFront"/>
     <constant name="EMBarrel_rmax" value="BarCryoECal_rmax-CryoBarrelBack-LArBathThicknessBack"/>
-    <constant name="EMBarrel_dz" value="BarECal_dz-CryoBarrelSide"/>
+    <constant name="EMBarrel_dz" value="BarCryoECal_dz-CryoBarrelSide"/>
     <!-- thickness of active volume between two absorber plates at EMBarrel_rmin, measuring perpendicular to the readout plate -->
     <constant name="LAr_thickness" value="LArGapThickness"/>
     <!-- passive layer consists of lead in the middle and steel on the outside, glued -->
@@ -71,6 +71,7 @@
     <constant name="Glue_thickness" value="0.1*mm"/>
     <!-- readout in between two absorber plates -->
     <constant name="readout_thickness" value="1.2*mm"/>
+    <constant name="ECal_cell_size" value="5.1*mm"/>
   </define>
 
   <display>
@@ -83,19 +84,19 @@
     <readout name="ECalBarrelEta">
         <!-- segmentation type="GridTheta_k4geo" grid_size_theta="0.5625" offset_theta="-0.83"/ -->
         <segmentation type="GridEta_k4geo" grid_size_eta="0.01" offset_eta="-1.2"/>
-      <id>system:4,cryo:1,type:3,subtype:3,layer:8,module:11,eta:9</id>
+      <id>system:5,cryo:1,type:3,subtype:3,layer:8,module:11,eta:9</id>
     </readout>
     <!-- readout for the reconstruction -->
     <!-- phi position is calculated based on the centre of volume (hence it cannot be done in the simulation from energy deposits position) -->
     <readout name="ECalBarrelPhiEta">
         <!-- segmentation type="FCCSWGridPhiTheta_k4geo" grid_size_theta="0.5625" phi_bins="768" offset_theta="-0.83" offset_phi="-pi+(pi/768.)"/ -->
         <segmentation type="FCCSWGridPhiEta_k4geo" grid_size_eta="0.01" phi_bins="768" offset_eta="-1.2" offset_phi="-pi+(pi/768.)"/>
-      <id>system:4,cryo:1,type:3,subtype:3,layer:8,eta:9,phi:10</id>
+      <id>system:5,cryo:1,type:3,subtype:3,layer:8,eta:9,phi:10</id>
     </readout>
   </readouts>
 
   <detectors>
-    <detector id="BarECal_id" name="ECalBarrel" type="ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v03" readout="ECalBarrelEta">
+    <detector id="DetID_ECal_Barrel" name="ECalBarrel" type="ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v01" readout="ECalBarrelEta">
       <type_flags type=" DetType_CALORIMETER + DetType_ELECTROMAGNETIC + DetType_BARREL"/>
       <sensitive type="SimpleCalorimeterSD"/>
       <dimensions rmin="BarCryoECal_rmin" rmax="BarCryoECal_rmax" dz="BarCryoECal_dz" vis="ecal_envelope"/>