From fec870ab0755c3c4fea8af8c4cd87c3e1a1d9037 Mon Sep 17 00:00:00 2001
From: Anna Zaborowska <anna.zaborowska@cern.ch>
Date: Wed, 15 Dec 2021 14:53:01 +0100
Subject: [PATCH 1/2] Remove the hardcoded sensitive type

---
 Detector/DetFCCeeCLD/src/CLD_GenericCalBarrel_o1_v01_geo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Detector/DetFCCeeCLD/src/CLD_GenericCalBarrel_o1_v01_geo.cpp b/Detector/DetFCCeeCLD/src/CLD_GenericCalBarrel_o1_v01_geo.cpp
index 6d8d15c2..c8a434b0 100644
--- a/Detector/DetFCCeeCLD/src/CLD_GenericCalBarrel_o1_v01_geo.cpp
+++ b/Detector/DetFCCeeCLD/src/CLD_GenericCalBarrel_o1_v01_geo.cpp
@@ -91,7 +91,7 @@ static Ref_t CLD_GenericCalBarrel_o1_v01_geo(Detector& theDetector, xml_h e, Sen
 
     dd4hep::xml::Dimension sdTyp = x_det.child(_U(sensitive));  
     std::string thesenstype = sdTyp.typeStr() ;
-    sens.setType( "SimpleCalorimeterSD"  ) ;
+    sens.setType( thesenstype ) ;
 
     //std::string thesenstype = "calorimeter";  // default as of LCGEO
     //if ( x_det.hasAttr(_U(sensitive))  ) {

From bfaec4a3c75078c1b3766ead2af856d85eb5370b Mon Sep 17 00:00:00 2001
From: Anna Zaborowska <anna.zaborowska@cern.ch>
Date: Mon, 14 Mar 2022 15:47:10 +0100
Subject: [PATCH 2/2] Add detector for fast calo sim

---
 .../compact/FCCee_o2_v02/ECalBarrel.xml       |  9 ++++-
 .../compact/FCCee_o2_v02/ECalEndcap.xml       |  2 +-
 .../FCCee_o2_v02/FCCee_ECalOnly_o2_v02.xml    | 40 +++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 Detector/DetFCCeeCLD/compact/FCCee_o2_v02/FCCee_ECalOnly_o2_v02.xml

diff --git a/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/ECalBarrel.xml b/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/ECalBarrel.xml
index 3161ae36..31ac8598 100644
--- a/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/ECalBarrel.xml
+++ b/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/ECalBarrel.xml
@@ -33,13 +33,18 @@
     </display>
 
     <detectors>        
-        <detector name="ECalBarrel" type="CLD_GenericCalBarrel_o1_v01" id="DetID_ECal_Barrel" readout="ECalBarrelCollection" vis="ECALVis" gap="0.*cm">
+      <detector name="preECalBarrel" type="SimpleCylinder">
+        <dimensions rmin="ECalBarrel_inner_radius - 0.02*mm" rmax="ECalBarrel_inner_radius - 0.01*mm" dz="2.*ECalBarrel_half_length" phi0="0" deltaphi="360*deg" z_offset="0*cm" material="Air"/>
+    </detector>
+
+      <detector name="ECalBarrel" type="CLD_GenericCalBarrel_o1_v01" id="DetID_ECal_Barrel" readout="ECalBarrelCollection" vis="ECALVis" gap="0.*cm">
 
             <comment>EM Calorimeter Barrel</comment>
             
+
+            <sensitive type="FastSimCalorimeterSD"/>
             <type_flags type=" DetType_CALORIMETER + DetType_ELECTROMAGNETIC + DetType_BARREL"/>
 
-            <sensitive type="SimpleCalorimeterSD"/>
 
             <envelope vis="ECALVis">
                 <shape type="PolyhedraRegular" numsides="ECalBarrel_symmetry"  rmin="ECalBarrel_inner_radius" rmax="ECalBarrel_outer_radius" dz="2.*ECalBarrel_half_length"  material="Air"/>
diff --git a/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/ECalEndcap.xml b/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/ECalEndcap.xml
index bf4dc494..1aed4aa5 100644
--- a/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/ECalEndcap.xml
+++ b/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/ECalEndcap.xml
@@ -28,7 +28,7 @@
             
             <type_flags type=" DetType_CALORIMETER + DetType_ELECTROMAGNETIC + DetType_ENDCAP"/>
 
-            <sensitive type="SimpleCalorimeterSD"/>
+            <sensitive type="FastSimCalorimeterSD"/>
 
             <envelope vis="ECALVis">
                 <shape type="BooleanShape" operation="Subtraction" material="Air">
diff --git a/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/FCCee_ECalOnly_o2_v02.xml b/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/FCCee_ECalOnly_o2_v02.xml
new file mode 100644
index 00000000..fac83324
--- /dev/null
+++ b/Detector/DetFCCeeCLD/compact/FCCee_o2_v02/FCCee_ECalOnly_o2_v02.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+
+
+
+  <info name="FCCDectMaster"
+    title="FCCee CLD detector geometry master file"
+    author="CLD team"
+    url="no"
+    status="development"
+    version="1.0">
+    <comment> 
+      One stop shop for a baseline / the latest developments of the FCCee Detector concept.
+    </comment>
+  </info>
+
+  <includes>
+    <gdmlFile  ref="../../../DetCommon/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DetCommon/compact/materials.xml"/>
+    <gdmlFile  ref="additional_materials.xml"/> 
+  </includes>
+
+  <define>
+    <constant name="world_size" value="25*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+  </define>
+
+  <include ref="./FCCee_DectDimensions.xml" />
+
+  <include ref="../../../DetFCCeeCommon/compact/Beampipe.xml"/>
+
+  <include ref="ECalBarrel.xml"/>
+  <include ref="ECalEndcap.xml"/>
+
+
+</lccdd>