speed up NeutralProtoPAlg

Event/RecreatePIDTools/src/NeutralProtoPAlg.cpp

@@ -11,6 +11,7 @@
 #include "CaloDet/DeCalorimeter.h"
 #include "CaloFutureInterfaces/ICaloFutureHypoEstimator.h"
 #include "CaloFutureUtils/CaloFutureAlgUtils.h"
+#include "CaloFutureUtils/CaloMomentum.h"
 #include "CaloFutureUtils/NeutralClassifierUtils.h"
 #include "CaloFutureUtils/TrackUtils.h"
 #include "Core/FloatComparison.h"
@@ -130,39 +131,14 @@ LHCb::NeutralProtoPAlg::operator()( const LHCb::CaloHypos& hypos_from_mergedPi0s
   auto tableview   = tracktable.buildView();
   auto neutralview = neutralitytable.buildView();
 
-  // wrapper around data map getter, to include track match table the estimator doesn't have access to
-  auto getData = [&]( auto const* hypo ) {
-    // hypo data
-    auto data = m_estimator->get_data( ecal, hcal, *hypo );
-    // track relation
-    using namespace LHCb::Calo::Enum;
-    auto it      = data.find( DataType::CellID );
-    auto cellid  = ( it != data.end() ) ? static_cast<unsigned>( it->second ) : 0u;
-    auto cluster = clusters.find( LHCb::Detector::Calo::CellID( cellid ) );
-    if ( cluster != clusters.end() ) {
-      auto cls_idx = cluster->indices().cast();
-      auto clsview = tableview.scalar()[cls_idx];
-      auto ntrview = neutralview.scalar()[cls_idx];
-      if ( clsview.hasRelation() )
-        data[DataType::ClusterMatch] = clsview.relation().template get<LHCb::Calo::TrackUtils::ClusterMatch>().cast();
-      if ( ntrview.hasRelation() )
-        data[DataType::ClusterNeutrality] =
-            ntrview.relation().template get<LHCb::Calo::NeutralClassifierUtils::TrackMatchClassifier>().cast();
-    }
-    return data;
-  };
-
   // -- reset mass storage
   std::map<const int, double> mass_per_cell = { {} };
   // Get masses
   for ( const auto* hypo : hypos_from_mergedPi0s ) {
-    if ( !hypo ) continue;
-    using namespace LHCb::Calo::Enum;
-    // The call to process is happening twice for mergedPi0s, should be made smarter.
-    auto      data          = getData( hypo );
-    const int cellCode      = data.at( DataType::CellID );
-    auto      it            = data.find( DataType::HypoM );
-    mass_per_cell[cellCode] = ( it != data.end() ? it->second : Default );
+    auto cluster = LHCb::CaloFutureAlgUtils::ClusterFromHypo( *hypo );
+    if ( !cluster ) continue;
+    LHCb::Calo::Momentum mom( hypo );
+    mass_per_cell[cluster->seed().all()] = mom.mass();
   }
 
   //------ loop over all caloHypo containers
@@ -175,7 +151,6 @@ LHCb::NeutralProtoPAlg::operator()( const LHCb::CaloHypos& hypos_from_mergedPi0s
 
     // == Loop over CaloHypos
     for ( const auto* hypo : hypos ) {
-      if ( !hypo ) { continue; }
       count++;
 
       // == create and store the corresponding ProtoParticle
@@ -189,13 +164,24 @@ LHCb::NeutralProtoPAlg::operator()( const LHCb::CaloHypos& hypos_from_mergedPi0s
 
       const auto hypothesis = hypo->hypothesis();
 
-      auto data = getData( hypo );
+      // hypo data
+      auto data = m_estimator->get_data( ecal, hcal, *hypo );
+
+      // track relation
+      using namespace LHCb::Calo::Enum;
+      auto     it     = data.find( DataType::CellID );
+      unsigned cellid = ( it != data.end() ) ? static_cast<unsigned>( it->second ) : Default;
+
+      auto cluster = clusters.find( LHCb::Detector::Calo::CellID( cellid ) );
+      if ( cluster != clusters.end() ) {
+        auto clsview = tableview.scalar()[cluster->indices().cast()];
+        if ( clsview.hasRelation() )
+          data[DataType::ClusterMatch] = clsview.relation().template get<LHCb::Calo::TrackUtils::ClusterMatch>().cast();
+      }
 
       // create NeutralPID object
       auto pid = std::make_unique<LHCb::NeutralPID>();
-
-      auto cellidcode = data.find( DataType::CellID ) != data.end() ? data.find( DataType::CellID )->second : Default;
-      pid->setCaloNeutralID( LHCb::Detector::Calo::CellID( (unsigned)cellidcode ) );
+      pid->setCaloNeutralID( LHCb::Detector::Calo::CellID( cellid ) );
 
       auto set = [&]( auto fn, const DataType t ) {
         auto i = data.find( t );
@@ -204,7 +190,7 @@ LHCb::NeutralProtoPAlg::operator()( const LHCb::CaloHypos& hypos_from_mergedPi0s
 
       // add data to NeutralPID object
       if ( hypothesis == LHCb::CaloHypo::Hypothesis::Photon || hypothesis == LHCb::CaloHypo::Hypothesis::Pi0Merged ) {
-        const auto it = mass_per_cell.find( cellidcode );
+        const auto it = mass_per_cell.find( cellid );
         if ( it != mass_per_cell.end() ) pid->setClusterMass( it->second );
       }
       set( &LHCb::NeutralPID::setCaloNeutralEcal, DataType::ClusterE );