fix metadata of topoclusters (#118)

* fix metadata of topoclusters * also fix tool for FCChh
HEP-FCC · Oct 16, 2024 · 3d639be · 3d639be
1 parent b571f7c
commit 3d639be
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/RecCalorimeter/src/components/CaloTopoCluster.cpp b/RecCalorimeter/src/components/CaloTopoCluster.cpp
@@ -7,7 +7,7 @@
 // k4geo
 #include "detectorCommon/DetUtils_k4geo.h"
 
-// datamodel
+// EDM4HEP
 #include "edm4hep/Cluster.h"
 #include "edm4hep/ClusterCollection.h"
 #include "edm4hep/CalorimeterHit.h"
@@ -79,6 +79,11 @@ StatusCode CaloTopoCluster::initialize() {
       return StatusCode::FAILURE;
     }
   }
+
+  // initialise the list of metadata for the clusters
+  std::vector<std::string> shapeParameterNames = {"dR_over_E"};
+  m_shapeParametersHandle.put(shapeParameterNames);
+
   return StatusCode::SUCCESS;
 }
 

diff --git a/RecCalorimeter/src/components/CaloTopoCluster.h b/RecCalorimeter/src/components/CaloTopoCluster.h
@@ -5,8 +5,9 @@
 #include "Gaudi/Algorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 
-// k4FWCore
+// Key4HEP
 #include "k4FWCore/DataHandle.h"
+#include "k4FWCore/MetaDataHandle.h"
 #include "k4Interface/ICaloReadCellNoiseMap.h"
 #include "k4Interface/ICaloReadNeighboursMap.h"
 #include "k4Interface/ICalorimeterTool.h"
@@ -15,13 +16,14 @@
 
 class IGeoSvc;
 
-// datamodel
+// EDM4HEP
 namespace edm4hep {
 class CalorimeterHit;
 class CalorimeterHitCollection;
 class ClusterCollection;
 }
 
+// DD4HEP
 namespace DD4hep {
 namespace DDSegmentation {
 class Segmentation;
@@ -97,6 +99,11 @@ class CaloTopoCluster : public Gaudi::Algorithm {
   mutable DataHandle<edm4hep::ClusterCollection> m_clusterCollection{"calo/clusters", Gaudi::DataHandle::Writer, this};
   // Cluster cells in collection
   mutable DataHandle<edm4hep::CalorimeterHitCollection> m_clusterCellsCollection{"calo/clusterCells", Gaudi::DataHandle::Writer, this};
+  /// Handle for the cluster shape metadata to write
+  MetaDataHandle<std::vector<std::string>> m_shapeParametersHandle{
+    m_clusterCollection,
+    edm4hep::labels::ShapeParameterNames,
+    Gaudi::DataHandle::Writer};
   /// Pointer to the geometry service
   SmartIF<IGeoSvc> m_geoSvc;
   /// Handle for the input tool

diff --git a/RecFCCeeCalorimeter/src/components/CaloTopoClusterFCCee.cpp b/RecFCCeeCalorimeter/src/components/CaloTopoClusterFCCee.cpp
@@ -86,6 +86,10 @@ StatusCode CaloTopoClusterFCCee::initialize() {
   m_decoder_ecal = m_geoSvc->getDetector()->readout(m_readoutName).idSpec().decoder();
   m_index_layer_ecal = m_decoder_ecal->index("layer");
 
+  // initialise the list of metadata for the clusters
+  std::vector<std::string> shapeParameterNames = {"dR_over_E"};
+  m_shapeParametersHandle.put(shapeParameterNames);
+
   return StatusCode::SUCCESS;
 }
 

diff --git a/RecFCCeeCalorimeter/src/components/CaloTopoClusterFCCee.h b/RecFCCeeCalorimeter/src/components/CaloTopoClusterFCCee.h
@@ -10,8 +10,9 @@
 #include "Gaudi/Algorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 
-// k4FWCore
+// Key4HEP
 #include "k4FWCore/DataHandle.h"
+#include "k4FWCore/MetaDataHandle.h"
 #include "k4Interface/ICaloReadCellNoiseMap.h"
 #include "k4Interface/ICaloReadNeighboursMap.h"
 #include "k4Interface/ICalorimeterTool.h"
@@ -21,13 +22,14 @@
 // k4SimGeant4
 class IGeoSvc;
 
-// Datamodel
+// EDM4HEP
 namespace edm4hep {
 class CalorimeterHit;
 class CalorimeterHitCollection;
 class ClusterCollection;
 }
 
+// DD4HEP
 namespace DD4hep {
 namespace DDSegmentation {
 class Segmentation;
@@ -102,6 +104,11 @@ class CaloTopoClusterFCCee : public Gaudi::Algorithm {
   mutable DataHandle<edm4hep::ClusterCollection> m_clusterCollection{"calo/clusters", Gaudi::DataHandle::Writer, this};
   // Cluster cells in collection
   mutable DataHandle<edm4hep::CalorimeterHitCollection> m_clusterCellsCollection{"calo/clusterCells", Gaudi::DataHandle::Writer, this};
+  /// Handle for the cluster shape metadata to write
+  MetaDataHandle<std::vector<std::string>> m_shapeParametersHandle{
+    m_clusterCollection,
+    edm4hep::labels::ShapeParameterNames,
+    Gaudi::DataHandle::Writer};
   /// Pointer to the geometry service
   SmartIF<IGeoSvc> m_geoSvc;
   /// Handle for the input tool