fix iterator handling for decay chain traversal

Author: aalkin

PWGDQ/Core/MCSignal.h

@@ -130,6 +130,7 @@ class MCSignal : public TNamed
 template <typename T>
 bool MCSignal::CheckProng(int i, bool checkSources, const T& track)
 {
+  using P = typename T::parent_t;
   auto currentMCParticle = track;
   // loop over the generations specified for this prong
   for (int j = 0; j < fProngs[i].fNGenerations; j++) {
@@ -159,7 +160,7 @@ bool MCSignal::CheckProng(int i, bool checkSources, const T& track)
         LOGF(debug, "M2 %d %d", mcParticle.globalIndex(), m.globalIndex());
       }*/
       if (currentMCParticle.has_mothers() && j < fProngs[i].fNGenerations - 1) {
-        currentMCParticle = currentMCParticle.mothers_first_as<>();
+        currentMCParticle = currentMCParticle.template mothers_first_as<P>();
         //currentMCParticle = mcStack.iteratorAt(currentMCParticle.mothersIds()[0]);
         // currentMCParticle = currentMCParticle.template mother0_as<U>();
       }
@@ -169,7 +170,7 @@ bool MCSignal::CheckProng(int i, bool checkSources, const T& track)
         return false;
       }
       if (currentMCParticle.has_daughters() && j < fProngs[i].fNGenerations - 1) {
-        const auto& daughtersSlice = currentMCParticle.daughters_as<>();
+        const auto& daughtersSlice = currentMCParticle.template daughters_as<P>();
         for (auto& d : daughtersSlice) {
           if (fProngs[i].TestPDG(j + 1, d.pdgCode())) {
             // currentMCParticle = d;
@@ -235,7 +236,7 @@ bool MCSignal::CheckProng(int i, bool checkSources, const T& track)
           /*for (auto& m : mcParticle.mothers_as<aod::McParticles_001>()) {
             LOGF(debug, "M2 %d %d", mcParticle.globalIndex(), m.globalIndex());
           }*/
-          currentMCParticle = currentMCParticle.mothers_first_as<>();
+          currentMCParticle = currentMCParticle.template mothers_first_as<P>();
           //currentMCParticle = mcStack.iteratorAt(currentMCParticle.mothersIds()[0]);
           // currentMCParticle = currentMCParticle.template mother0_as<U>();
         }
@@ -251,7 +252,7 @@ bool MCSignal::CheckProng(int i, bool checkSources, const T& track)
           return false;
         }
         if (currentMCParticle.has_daughters() && j < fProngs[i].fNGenerations - 1) {
-          const auto& daughtersSlice = currentMCParticle.daughters_as<>();
+          const auto& daughtersSlice = currentMCParticle.template daughters_as<P>();
           for (auto& d : daughtersSlice) {
             if (fProngs[i].TestPDG(j + 1, d.pdgCode())) {
               // currentMCParticle = d;

PWGDQ/Tasks/dqEfficiency.cxx

@@ -22,7 +22,6 @@
 #include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGDQ/Core/VarManager.h"
 #include "PWGDQ/Core/HistogramManager.h"
@@ -32,12 +31,8 @@
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
-#include "DataFormatsParameters/GRPObject.h"
 #include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"
 
 using std::cout;
@@ -810,7 +805,7 @@ struct AnalysisSameEventPairing {
   }   // end runPairing
 
   template <typename TTracksMC>
-  void runMCGen(TTracksMC const& groupedMCTracks)
+  void runMCGen(TTracksMC& groupedMCTracks)
   {
     // loop over mc stack and fill histograms for pure MC truth signals
     // group all the MC tracks which belong to the MC event corresponding to the current reconstructed event
@@ -824,7 +819,14 @@ struct AnalysisSameEventPairing {
         if (sig.GetNProngs() != 1) { // NOTE: 1-prong signals required
           continue;
         }
-        if (sig.CheckSignal(false, mctrack)) {
+        bool checked = false;
+        if constexpr(soa::is_soa_filtered_v<TTracksMC>) {
+          auto mctrack_raw = groupedMCTracks.rawIteratorAt(mctrack.globalIndex());
+          checked = sig.CheckSignal(false, mctrack_raw);
+        } else {
+          checked = sig.CheckSignal(false, mctrack);
+        }
+        if (checked) {
           fHistMan->FillHistClass(Form("MCTruthGen_%s", sig.GetName()), VarManager::fgValues);
         }
       }
@@ -836,7 +838,15 @@ struct AnalysisSameEventPairing {
         continue;
       }
       for (auto& [t1, t2] : combinations(groupedMCTracks, groupedMCTracks)) {
-        if (sig.CheckSignal(false, t1, t2)) {
+        bool checked = false;
+        if constexpr(soa::is_soa_filtered_v<TTracksMC>) {
+          auto t1_raw = groupedMCTracks.rawIteratorAt(t1.globalIndex());
+          auto t2_raw = groupedMCTracks.rawIteratorAt(t2.globalIndex());
+          checked = sig.CheckSignal(false, t1_raw, t2_raw);
+        } else {
+          checked = sig.CheckSignal(false, t1, t2);
+        }
+        if (checked) {
           VarManager::FillPairMC(t1, t2);
           fHistMan->FillHistClass(Form("MCTruthGenPair_%s", sig.GetName()), VarManager::fgValues);
         }