[PWGDQ] fill event information in runMCGen

PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx

@@ -64,7 +64,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <iterator>
 #include <map>
 #include <memory>
@@ -294,7 +294,7 @@
 void PrintBitMap(TMap map, int nbits)
 {
   for (int i = 0; i < nbits; i++) {
     cout << ((map & (TMap(1) << i)) > 0 ? "1" : "0");
   }
 }
 
@@ -329,7 +329,7 @@
 
   void init(o2::framework::InitContext& context)
   {
     cout << "AnalysisEventSelection::init() called" << endl;
     if (context.mOptions.get<bool>("processDummy")) {
       return;
     }
@@ -374,13 +374,13 @@
     fCCDB->setLocalObjectValidityChecking();
     fCCDB->setCreatedNotAfter(fConfigNoLaterThan.value);
     fCCDBApi.init(fConfigCcdbUrl.value);
     cout << "AnalysisEventSelection::init() completed" << endl;
   }
 
   template <uint32_t TEventFillMap, typename TEvents, typename TEventsMC>
   void runEventSelection(TEvents const& events, BCsWithTimestamps const& bcs, TEventsMC const& mcEvents)
   {
     cout << "AnalysisEventSelection::runEventSelection() called with " << events.size() << " events and " << bcs.size() << " BCs" << endl;
     if (bcs.size() > 0 && bcs.begin().runNumber() != fCurrentRun) {
       std::map<std::string, std::string> metadataRCT, header;
       header = fCCDBApi.retrieveHeaders(Form("RCT/Info/RunInformation/%i", bcs.begin().runNumber()), metadataRCT, -1);
@@ -389,7 +389,7 @@
       VarManager::SetSORandEOR(sor, eor);
     }
 
     cout << "Filling TimeFrame statistics histograms" << endl;
     VarManager::ResetValues(0, VarManager::kNEventWiseVariables);
     VarManager::FillTimeFrame(bcs);
     VarManager::FillTimeFrame(events);
@@ -402,7 +402,7 @@
     fBCCollMap.clear();
     // int iEvent = 0;
 
     cout << "Starting event loop for event selection" << endl;
     for (auto& event : events) {
 
       auto bc = event.template bc_as<BCsWithTimestamps>();
@@ -450,13 +450,13 @@
       }
     }
 
     cout << "AnalysisEventSelection::runEventSelection() completed" << endl;
   }
 
   template <uint32_t TEventFillMap, typename TEvents>
   void publishSelections(TEvents const& events)
   {
     cout << "AnalysisEventSelection::publishSelections() called" << endl;
     std::map<int64_t, bool> collisionSplittingMap; // key: event global index, value: whether pileup event is a possible splitting
 
     // Reset the fValues array and fill event observables
@@ -530,7 +530,7 @@
       }
       eventSel(evSel);
     }
     cout << "AnalysisEventSelection::publishSelections() completed" << endl;
   }
 
   void processDirect(MyEvents const& events, BCsWithTimestamps const& bcs, soa::Join<aod::McCollisions, aod::McCollsExtra, aod::MultMCExtras> const& mcEvents)
@@ -2017,7 +2017,7 @@
   PresliceUnsorted<aod::McParticles> perReducedMcEvent = aod::mcparticle::mcCollisionId;
 
   // template <int TPairType, typename TEventsMC>
-  template <int TPairType, typename TEvents, typename TEventsMC>
+  template <int TPairType, uint32_t TEventFillMap, typename TEvents, typename TEventsMC>
   void runMCGen(TEvents const& events, TEventsMC const& mcEvents, McParticles const& mcTracks)
   {
     cout << "AnalysisSameEventPairing::runMCGen() called" << endl;
@@ -2053,7 +2053,11 @@
       eFromJpsiMcParticleIndices.clear();
 
       auto mcCollisionGlobalIndex = event.mcCollisionId();
-      // auto mcEvent = mcEvents.rawIteratorAt(mcCollisionGlobalIndex);
+      auto mcEvent = mcEvents.rawIteratorAt(mcCollisionGlobalIndex);
+
+      // fill event information
+      VarManager::FillEvent<TEventFillMap>(event);
+      VarManager::FillEvent<VarManager::ObjTypes::CollisionMC>(mcEvent);
 
       auto groupedMCTracks = mcTracks.sliceBy(perReducedMcEvent, mcCollisionGlobalIndex);
       groupedMCTracks.bindInternalIndicesTo(&mcTracks);
@@ -2161,7 +2165,7 @@
   {
     cout << "AnalysisSameEventPairing::processBarrelOnly() called" << endl;
     runSameEventPairing<true, VarManager::kDecayToEE, gkEventFillMapWithMults, gkTrackFillMapWithCov>(events, bcs, trackAssocsPerCollision, barrelAssocs, barrelTracks, mcEvents, mcTracks);
-    runMCGen<VarManager::kDecayToEE>(events, mcEvents, mcTracks);
+    runMCGen<VarManager::kDecayToEE, gkEventFillMapWithMults>(events, mcEvents, mcTracks);
     cout << "AnalysisSameEventPairing::processBarrelOnly() completed" << endl;
   }
 
@@ -2171,7 +2175,7 @@
   {
     cout << "AnalysisSameEventPairing::processBarrelPbPbOnly() called" << endl;
     runSameEventPairing<true, VarManager::kDecayToEE, gkEventFillMapWithCentAndMults, gkTrackFillMapWithCov>(events, bcs, trackAssocsPerCollision, barrelAssocs, barrelTracks, mcEvents, mcTracks);
-    runMCGen<VarManager::kDecayToEE>(events, mcEvents, mcTracks);
+    runMCGen<VarManager::kDecayToEE, gkEventFillMapWithCentAndMults>(events, mcEvents, mcTracks);
     cout << "AnalysisSameEventPairing::processBarrelPbPbOnly() completed" << endl;
   }