From 51a5c5e9a5306d3a517dd965be87a7a5cdd30773 Mon Sep 17 00:00:00 2001
From: michaela mlynarikova <michaela.mlynarikova@cern.ch>
Date: Tue, 1 Nov 2022 08:08:30 +0100
Subject: [PATCH] update HCal xml

---
 .../compact/FCCee_HCalBarrel_TileCal.xml      | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/Detector/DetFCCeeHCalTile/compact/FCCee_HCalBarrel_TileCal.xml b/Detector/DetFCCeeHCalTile/compact/FCCee_HCalBarrel_TileCal.xml
index 12221dc2..bab7f8e6 100644
--- a/Detector/DetFCCeeHCalTile/compact/FCCee_HCalBarrel_TileCal.xml
+++ b/Detector/DetFCCeeHCalTile/compact/FCCee_HCalBarrel_TileCal.xml
@@ -8,8 +8,8 @@
     url="no"
     status="development"
     version="1.0">
-    <comment>HCal layout based on ATLAS HCal, with realistic longitudinal segmentation and steel support</comment>
-    <comment>5. May 2017, C. Neubueser: fixes and layer implementation </comment>
+    <comment>The first FCCee HCal layout based on ATLAS HCal, not optimised yet</comment>
+    <comment>1. Nov 2022, J. Faltova: update material and radial segmentation for FCCee </comment>
   </info>
   <define>
     <constant name="BarHCal_zOff" value="0"/>
@@ -31,12 +31,11 @@
 
   <display>
     <vis name="hcal_steel_vis" r="0.5" g="0.5" b="0.5" alpha="1" showDaughters="true" visible="true" drawingStyle="solid" />
-    <vis name="hcal_steel_master_vis" r="0.6" g="0.6" b="0.6" alpha="1" showDaughters="true" visible="true" drawingStyle="solid" />
-    <vis name="hcal_steel_support_vis" r="0.8" g="0.3" b="0.3" alpha="1" showDaughters="true" visible="true" drawingStyle="solid" />
+    <vis name="hcal_master_vis" r="0.6" g="0.6" b="0.6" alpha="1" showDaughters="true" visible="true" drawingStyle="solid" />
+    <vis name="hcal_support_vis" r="0.8" g="0.3" b="0.3" alpha="1" showDaughters="true" visible="true" drawingStyle="solid" />
     <vis name="hcal_face_plate_vis" r="0.8" g="0.3" b="0.3" alpha="1" showDaughters="true" visible="true" drawingStyle="solid" />
     <vis name="hcal_end_plate_vis" r="0.8" g="0.3" b="0.3" alpha="1" showDaughters="true" visible="true" drawingStyle="solid" />
-    <vis name="hcal_polystyrene_vis" r="0.0" g="0.6" b="0.3" alpha="0.8" showDaughters="true"
-    visible="true" />
+    <vis name="hcal_polystyrene_vis" r="0.0" g="0.6" b="0.3" alpha="0.8" showDaughters="true" visible="true" />
     <vis name="hcal_envelope" r="0.6" g="0.8" b="0.6" alpha="1" showDaughers="true" visible="true" />
     <vis name="hcal_barrel_seq1_vis" r="0.1" g="0.8" b="0.6" alpha="1" showDaughers="true" visible="true" />
     <vis name="hcal_barrel_seq2_vis" r="0.1" g="0.6" b="0.8" alpha="1" showDaughers="true" visible="true" />
@@ -45,21 +44,17 @@
   </display>
 
   <readouts>
-    <!-- Default readout of DetailedWedge geometry -->
-    <readout name="HCalBarrelDetailedWedgeReadout">
-     <id>system:4,module:8,row:9,layer:5</id>
-    </readout>
     <readout name="HCalBarrelReadout">
-      <segmentation type="FCCSWGridPhiEta" grid_size_eta="0.025" phi_bins="BarHCal_n_phi_modules" offset_eta="-1.256" offset_phi="-pi+(pi/BarHCal_n_phi_modules)"/>
+      <segmentation type="FCCSWGridPhiEta" grid_size_eta="0.025" phi_bins="BarHCal_n_phi_modules" offset_eta="-0.9" offset_phi="-pi+(pi/BarHCal_n_phi_modules)"/>
       <id>system:4,layer:5,row:9,eta:9,phi:10</id>
     </readout>
     <readout name="BarHCal_Readout_phieta">
-     <segmentation type="FCCSWGridPhiEta" grid_size_eta="0.025" phi_bins="BarHCal_n_phi_modules" offset_eta="-1.256" offset_phi="-pi+(pi/BarHCal_n_phi_modules)"/>
+     <segmentation type="FCCSWGridPhiEta" grid_size_eta="0.025" phi_bins="BarHCal_n_phi_modules" offset_eta="-0.9" offset_phi="-pi+(pi/BarHCal_n_phi_modules)"/>
      <id>system:4,layer:5,eta:9,phi:10</id>
     </readout>
    <readout name="BarHCal_Readout_phi">
      <!-- the eta segmentation here is a dummy - the whole hcal (extending to 1.5 in eta) is contained in one bin. the z position is stored in the "row" field. -->
-     <segmentation type="FCCSWGridPhiEta" grid_size_eta="3." phi_bins="BarHCal_n_phi_modules" offset_eta="-1.256" offset_phi="-pi+(pi/BarHCal_n_phi_modules)"/>
+     <segmentation type="FCCSWGridPhiEta" grid_size_eta="3." phi_bins="BarHCal_n_phi_modules" offset_eta="-0.9" offset_phi="-pi+(pi/BarHCal_n_phi_modules)"/>
      <id>system:4,layer:5,row:9,eta:0,phi:10</id>
     </readout>
   </readouts>
@@ -68,8 +63,8 @@
     <detector id="BarHCal_id" name="HCalBarrel" type="HCalTileBarrel" readout="HCalBarrelReadout" >
       <dimensions rmin="BarHCal_rmin" rmax="BarHCal_rmax" dz="BarHCal_dz" vis="hcal_envelope" />
       <sensitive type="BirksLawCalorimeterSD"/>
-      <end_plate name="end_plate" thickness="BarHCal_end_plate_thickness" material="Steel235" sensitive="false" vis="hcal_end_plate_vis" />
-      <face_plate name="face_plate" thickness="BarHCal_face_plate_thickness" material="Steel235" sensitive="false" vis="hcal_face_plate_vis" />
+      <end_plate name="end_plate" thickness="BarHCal_end_plate_thickness" material="Fe" sensitive="false" vis="hcal_end_plate_vis" />
+      <face_plate name="face_plate" thickness="BarHCal_face_plate_thickness" material="Fe" sensitive="false" vis="hcal_face_plate_vis" />
       <plate_space name="plate_space" thickness="BarHCal_plate_space" material="Air" sensitive="false" vis="hcal_air_vis" />
       <steel_support name="steel_support" thickness="BarHCal_steel_support_thickness" material="Steel235" sensitive="false" vis="hcal_steel_support_vis" />
       <layers>
@@ -82,13 +77,13 @@
         <layer id="1" name="type_2" material="Air" vis="hcal_barrel_layer_vis">
           <dimensions
              dr="100*mm"
-             nModules="4"
+             nModules="6"
              />
         </layer>
         <layer id="2" name="type_3" material="Air" vis="hcal_barrel_layer_vis">
           <dimensions
              dr="200*mm"
-             nModules="2"
+             nModules="3"
              />
         </layer>
       </layers>
@@ -100,11 +95,11 @@
           x="BarHCAL_module_spacing_phi"
         />
         <!-- Master plate -->
-        <module_component name="steelmaster" thickness="BarHCal_master_plate_thickness" y_offset="0" material="Steel235" sensitive="false" vis="hcal_steel_master_vis" />
+        <module_component name="master" thickness="BarHCal_master_plate_thickness" y_offset="0" material="Fe" sensitive="false" vis="hcal_steel_master_vis" />
         <!-- Spacer plate -->
-        <module_component name="pbspacer" thickness="BarHCal_spacer_plate_thickness" y_offset="0" material="Pb" sensitive="false" vis="hcal_steel_vis" />
+        <module_component name="spacer" thickness="BarHCal_spacer_plate_thickness" y_offset="0" material="Fe" sensitive="false" vis="hcal_steel_vis" />
         <!-- Master plate -->
-        <module_component name="steelmaster" thickness="BarHCal_master_plate_thickness" y_offset="0" material="Steel235" sensitive="false" vis="hcal_steel_master_vis" />
+        <module_component name="master" thickness="BarHCal_master_plate_thickness" y_offset="0" material="Fe" sensitive="false" vis="hcal_steel_master_vis" />
         <!-- Air -->
         <module_component name="airspacer" thickness="BarHCal_air_space_thickness"    y_offset="0" material="Air" sensitive="false" vis="hcal_air_vis" />
         <!-- Scintillator plate -->
@@ -119,7 +114,7 @@
           x="BarHCAL_module_spacing_phi"
         />
         <!-- Master plate -->
-        <module_component name="steelmaster" thickness="BarHCal_master_plate_thickness" y_offset="0" material="Steel235" sensitive="false" vis="hcal_steel_master_vis" />
+        <module_component name="master" thickness="BarHCal_master_plate_thickness" y_offset="0" material="Fe" sensitive="false" vis="hcal_steel_master_vis" />
         <!-- Air -->
         <module_component name="airspacer" thickness="BarHCal_air_space_thickness"    y_offset="0" material="Air" sensitive="false" vis="hcal_air_vis" />
         <!-- Scintillator plate -->
@@ -127,9 +122,9 @@
         <!-- Air -->
         <module_component name="airspacer" thickness="BarHCal_air_space_thickness"    y_offset="0" material="Air" sensitive="false" vis="hcal_air_vis" />
         <!-- Master plate -->
-        <module_component name="steelmaster" thickness="BarHCal_master_plate_thickness" y_offset="0" material="Steel235" sensitive="false" vis="hcal_steel_master_vis" />
+        <module_component name="master" thickness="BarHCal_master_plate_thickness" y_offset="0" material="Fe" sensitive="false" vis="hcal_steel_master_vis" />
         <!-- Spacer plate -->
-        <module_component name="pbspacer" thickness="BarHCal_spacer_plate_thickness" y_offset="0"  material="Pb" sensitive="false" vis="hcal_steel_vis" />
+        <module_component name="spacer" thickness="BarHCal_spacer_plate_thickness" y_offset="0"  material="Fe" sensitive="false" vis="hcal_steel_vis" />
       </sequence_b>
 
     </detector>