From 32ff4b06b43541a1d80e16bcbf0d2ef4e0151a8a Mon Sep 17 00:00:00 2001
From: Giovanni Marchiori <giovanni.marchiori@cern.ch>
Date: Thu, 21 Sep 2023 16:46:12 +0200
Subject: [PATCH] small updates after review of PR

---
 .../FCCee_ECalBarrel_thetamodulemerged.xml    | 23 +++----------------
 .../include/DetSegmentation/GridTheta.h       |  2 +-
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Detector/DetFCCeeECalInclined/compact/FCCee_ECalBarrel_thetamodulemerged.xml b/Detector/DetFCCeeECalInclined/compact/FCCee_ECalBarrel_thetamodulemerged.xml
index d4b13390..e9401b96 100644
--- a/Detector/DetFCCeeECalInclined/compact/FCCee_ECalBarrel_thetamodulemerged.xml
+++ b/Detector/DetFCCeeECalInclined/compact/FCCee_ECalBarrel_thetamodulemerged.xml
@@ -79,38 +79,21 @@
   </display>
 
   <readouts>
-    <!-- readout for the simulation -->
-    <!-- offset in theta is the eta max value including cryostat TO BE FIXED -->
-    <!-- THIS LACKS Z POSITION -->
-    <!--readout name="ECalBarrelTheta">
-        <segmentation type="GridTheta" grid_size_theta="0.009817477/4" offset_theta="0.5902785"/>
-        <id>system:4,cryo:1,type:3,subtype:3,layer:8,module:11,theta:10</id>
-    </readout-->
-
-    <!-- readout for the reconstruction, with phi-theta -->
-    <!-- readout name="ECalBarrelPhiTheta">
-        <segmentation type="FCCSWGridPhiTheta" grid_size_theta="0.009817477/4" phi_bins="1545" offset_theta="0.58902785" offset_phi="-pi+(pi/1545.)"/>
-        <id>system:4,cryo:1,type:3,subtype:3,layer:8,phi:11,theta:10</id>
-    </readout -->
-
-    <!-- readout for the simulation, with no merged modules and no merged cells in theta -->
+    <!-- readout for the simulation, with the baseline merging: 2x along the module direction in each layer; 4x along theta in each layer except layer 1 -->
+    <!-- the lists mergedCells_Theta and mergedModules define the number of cells to group together in the theta and module direction as a function of the layer -->
     <readout name="ECalBarrelModuleThetaMerged">
-      <!--segmentation type="FCCSWGridModuleThetaMerged" nModules="1545" mergedCells_Theta="1 1 1 1 1 1 1 1 1 1 1 1" mergedModules="1 1 1 1 1 1 1 1 1 1 1 1" grid_size_theta="0.00981745/4" offset_theta="0.5902785"/-->
       <segmentation type="FCCSWGridModuleThetaMerged" nModules="1545" mergedCells_Theta="4 1 4 4 4 4 4 4 4 4 4 4" mergedModules="2 2 2 2 2 2 2 2 2 2 2 2" grid_size_theta="0.009817477/4" offset_theta="0.5902785"/>
         <id>system:4,cryo:1,type:3,subtype:3,layer:8,module:11,theta:10</id>
     </readout>
 
-    <!-- readout for the reconstruction, with merged modules and merged cells in theta -->
+    <!-- example of adding a second readout for the reconstruction, to compare the two -->
     <readout name="ECalBarrelModuleThetaMerged2">
       <segmentation type="FCCSWGridModuleThetaMerged" nModules="1545" mergedCells_Theta="2 4 2 1 2 1 2 2 1 1 1 2" mergedModules="2 1 1 2 2 1 1 1 2 2 1 1" grid_size_theta="0.009817477/4" offset_theta="0.5902785"/>
-        <!--segmentation type="FCCSWGridModuleThetaMerged" nModules="1545" mergedCells_Theta="4 1 4 4 4 4 4 4 4 4 4 4" mergedModules="2 2 2 2 2 2 2 2 2 2 2 2" grid_size_theta="0.009817477/4" offset_theta="0.5902785"/-->
         <id>system:4,cryo:1,type:3,subtype:3,layer:8,module:11,theta:10</id>
     </readout>
   </readouts>
 
   <detectors>
-    <!--detector id="BarECal_id" name="ECalBarrel" type="EmCaloBarrelInclined" readout="ECalBarrelEta"-->
-    <!-- detector id="BarECal_id" name="ECalBarrel" type="EmCaloBarrelInclined" readout="ECalBarrelTheta"-->
     <detector id="BarECal_id" name="ECalBarrel" type="EmCaloBarrelInclined" readout="ECalBarrelModuleThetaMerged">
       <type_flags type=" DetType_CALORIMETER + DetType_ELECTROMAGNETIC + DetType_BARREL"/>
       <sensitive type="SimpleCalorimeterSD"/>
diff --git a/Detector/DetSegmentation/include/DetSegmentation/GridTheta.h b/Detector/DetSegmentation/include/DetSegmentation/GridTheta.h
index e8f086ea..5707d2e7 100644
--- a/Detector/DetSegmentation/include/DetSegmentation/GridTheta.h
+++ b/Detector/DetSegmentation/include/DetSegmentation/GridTheta.h
@@ -69,7 +69,7 @@ class GridTheta : public Segmentation {
   inline void setFieldNameTheta(const std::string& fieldName) { m_thetaID = fieldName; }
   /// calculates the Cartesian position from cylindrical coordinates (r, phi, theta)
   inline Vector3D positionFromRThetaPhi(double ar, double atheta, double aphi) const {
-    return Vector3D(ar * std::cos(aphi), ar * std::sin(aphi),  ar * std::cos(atheta)/std::sin(atheta));
+    return Vector3D(ar * std::cos(aphi), ar * std::sin(aphi), ar * std::cos(atheta)/std::sin(atheta));
   }
   /// calculates the theta angle from Cartesian coordinates
   inline double thetaFromXYZ(const Vector3D& aposition) const {