Merge branch 'CookieCutterReFactoriseDDE' into 'main'

egamma cookie cutter refactorise dde

See merge request !68875

Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx

@@ -297,32 +297,7 @@ void egammaForwardBuilder::cookieCut(
     return;
   }
 
-  CookieCutterHelpers::CentralPosition cp0({&cluster});
-  CookieCutterHelpers::CentralPosition cpRef = cp0;
-
-  if (cp0.emaxEC > 0) {
-    const CaloDetDescrElement* dde =
-      mgr.get_element(CaloCell_ID::EME2, cpRef.etaEC, cpRef.phiEC);
-    if (dde) {
-      cp0.etaEC = dde->eta_raw();
-      cp0.phiEC = dde->phi_raw();
-    } else {
-      ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
-                      << cpRef.etaEC << ", phi = " << cpRef.phiEC);
-    }
-  }
-  if (cp0.emaxF > 0) {
-    const CaloDetDescrElement* dde =
-      mgr.get_element(CaloCell_ID::FCAL0, cpRef.etaF, cpRef.phiF);
-    if (dde) {
-      cp0.etaF = dde->eta_raw();
-      cp0.phiF = dde->phi_raw();
-    } else {
-      ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
-                      << cpRef.etaF << ", phi = " << cpRef.phiF);
-    }
-  }
-
+  CookieCutterHelpers::CentralPosition cp0({&cluster}, mgr);
   CaloClusterCellLink* cell_links = cluster.getOwnCellLinks();
   CaloClusterCellLink::iterator cell_itr = cell_links->begin();
 

Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx

@@ -492,34 +492,7 @@ egammaSuperClusterBuilderBase::createNewCluster(
   newCluster->setClusterSize(xAOD::CaloCluster::SuperCluster);
   // Let's try to find the eta and phi of the hottest cell in L2.
   // This will be used as the center for restricting the cluster size.
-  CookieCutterHelpers::CentralPosition cpRef(clusters);
-  // these are the same as the reference but in calo frame
-  // (after the processing below)
-  CookieCutterHelpers::CentralPosition cp0 = cpRef;
-  // Get the hotest in raw co-ordinates
-  if (cp0.emaxB > 0) {
-    const CaloDetDescrElement* dde =
-      mgr.get_element(CaloCell_ID::EMB2, cpRef.etaB, cpRef.phiB);
-    if (dde) {
-      cp0.etaB = dde->eta_raw();
-      cp0.phiB = dde->phi_raw();
-    } else {
-      ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
-                      << cpRef.etaB << ", phi = " << cpRef.phiB);
-    }
-  }
-
-  if (cp0.emaxEC > 0) {
-    const CaloDetDescrElement* dde =
-      mgr.get_element(CaloCell_ID::EME2, cpRef.etaEC, cpRef.phiEC);
-    if (dde) {
-      cp0.etaEC = dde->eta_raw();
-      cp0.phiEC = dde->phi_raw();
-    } else {
-      ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
-                      << cpRef.etaEC << ", phi = " << cpRef.phiEC);
-    }
-  }
+  CookieCutterHelpers::CentralPosition cp0(clusters, mgr);
 
   // Set the eta0/phi0 based on the references, but in raw coordinates
   if (cp0.emaxB >= cp0.emaxEC) {

Reconstruction/egamma/egammaCaloUtils/CMakeLists.txt

@@ -10,6 +10,7 @@ atlas_add_library( egammaCaloUtils
    egammaUtils/*.h src/*.cxx
    PUBLIC_HEADERS egammaCaloUtils
    LINK_LIBRARIES CaloDetDescrLib CaloEvent CaloGeoHelpers 
-   CaloIdentifier CaloUtilsLib xAODCaloEvent GaudiKernel
+   CaloIdentifier CaloUtilsLib xAODCaloEvent GaudiKernel 
+   AthenaBaseComps
    PRIVATE_LINK_LIBRARIES egammaUtils)
 

Reconstruction/egamma/egammaCaloUtils/egammaCaloUtils/CookieCutterHelpers.h

@@ -6,7 +6,8 @@
 #define COOKIECUTTERHELPERS_H
 
 #include "xAODCaloEvent/CaloCluster.h"
-
+#include "AthenaBaseComps/AthMessaging.h"
+#include "CaloDetDescr/CaloDetDescrManager.h"
 #include "GaudiKernel/SystemOfUnits.h"
 
 namespace CookieCutterHelpers
@@ -14,7 +15,7 @@ namespace CookieCutterHelpers
 /** Find the reference position (eta, phi) relative to which cells are
    restricted.
 */
-struct CentralPosition
+struct CentralPosition : public AthMessaging
 {
   float etaB = 999;
   float phiB = 999;
@@ -27,7 +28,9 @@ struct CentralPosition
   float emaxF = -999 * Gaudi::Units::GeV;
 
   CentralPosition() = default;
-  CentralPosition(const std::vector<const xAOD::CaloCluster*>& clusters);
+  CentralPosition(
+    const std::vector<const xAOD::CaloCluster*>& clusters,
+    const CaloDetDescrManager& mgr);
 };
 
 /** Find the size of the cluster in phi using L2 cells.

Reconstruction/egamma/egammaCaloUtils/src/CookieCutterHelpers.cxx

@@ -7,7 +7,10 @@
 
 namespace CookieCutterHelpers
 {
-CentralPosition::CentralPosition(const std::vector<const xAOD::CaloCluster*>& clusters)
+CentralPosition::CentralPosition(
+  const std::vector<const xAOD::CaloCluster*>& clusters,
+  const CaloDetDescrManager& mgr)
+  : AthMessaging("CookieCutterHelpers::CentralPosition")
 {
   for (const auto* cluster : clusters) {
     if (cluster->hasSampling(CaloSampling::EMB2)) {
@@ -35,6 +38,40 @@ CentralPosition::CentralPosition(const std::vector<const xAOD::CaloCluster*>& cl
       }
     }
   }
+
+  if (emaxB > 0) {
+    const CaloDetDescrElement* dde =
+      mgr.get_element(CaloCell_ID::EMB2, etaB, phiB);
+    if (dde) {
+      etaB = dde->eta_raw();
+      phiB = dde->phi_raw();
+    } else {
+      ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
+                      << etaB << ", phi = " << phiB);
+    }
+  }
+  if (emaxEC > 0) {
+    const CaloDetDescrElement* dde =
+      mgr.get_element(CaloCell_ID::EME2, etaEC, phiEC);
+    if (dde) {
+      etaEC = dde->eta_raw();
+      phiEC = dde->phi_raw();
+    } else {
+      ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
+                      << etaEC << ", phi = " << phiEC);
+    }
+  }
+  if (emaxF > 0) {
+    const CaloDetDescrElement* dde =
+      mgr.get_element(CaloCell_ID::FCAL0, etaF, phiF);
+    if (dde) {
+      etaF = dde->eta_raw();
+      phiF = dde->phi_raw();
+    } else {
+      ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
+                      << etaF << ", phi = " << phiF);
+    }
+  }
 }
 
 PhiSize::PhiSize(const CentralPosition& cp0, const xAOD::CaloCluster& cluster)