diff --git a/PWGEM/PhotonMeson/TableProducer/createEMReducedEvent.cxx b/PWGEM/PhotonMeson/TableProducer/createEMReducedEvent.cxx index f4ad381762a..91c6f9320fb 100644 --- a/PWGEM/PhotonMeson/TableProducer/createEMReducedEvent.cxx +++ b/PWGEM/PhotonMeson/TableProducer/createEMReducedEvent.cxx @@ -29,6 +29,8 @@ using namespace o2::framework; using namespace o2::framework::expressions; using namespace o2::soa; +using MyBCs = soa::Join; + using MyCollisions = soa::Join; using MyCollisions_Cent = soa::Join; // centrality table has dependency on multiplicity table. @@ -53,18 +55,18 @@ struct CreateEMEvent { hEventCounter->GetXaxis()->SetBinLabel(2, "sel8"); } - PresliceUnsorted preslice_collisions_per_bc = o2::aod::collision::bcId; + PresliceUnsorted preslice_collisions_per_bc = o2::aod::evsel::foundBCId; std::unordered_map map_ncolls_per_bc; //! Please don't skip any event! - template - void skimEvent(TEvents const& collisions, aod::BCs const& bcs) + template + void skimEvent(TCollisions const& collisions, TBCs const& bcs) { // first count the number of collisions per bc for (auto& bc : bcs) { auto collisions_per_bc = collisions.sliceBy(preslice_collisions_per_bc, bc.globalIndex()); map_ncolls_per_bc[bc.globalIndex()] = collisions_per_bc.size(); - // LOGF(info, "bc.globalIndex() = %d , collisions_per_bc.size() = %d", bc.globalIndex(), collisions_per_bc.size()); + // LOGF(info, "bc-loop | bc.globalIndex() = %d , collisions_per_bc.size() = %d", bc.globalIndex(), collisions_per_bc.size()); } for (auto& collision : collisions) { @@ -73,8 +75,9 @@ struct CreateEMEvent { continue; } } + auto bc = collision.template foundBC_as(); - // LOGF(info, "collision.bc().globalIndex() = %d, ncolls_per_bc = %d", collision.bc().globalIndex(), map_ncolls_per_bc[collision.bc().globalIndex()]); + // LOGF(info, "collision-loop | bc.globalIndex() = %d, ncolls_per_bc = %d", bc.globalIndex(), map_ncolls_per_bc[bc.globalIndex()]); registry.fill(HIST("hEventCounter"), 1); bool is_phoscpv_readout = collision.alias_bit(kTVXinPHOS); @@ -85,8 +88,8 @@ struct CreateEMEvent { } uint64_t tag = collision.selection_raw(); - event(collision.globalIndex(), tag, collision.bc().runNumber(), collision.bc().triggerMask(), collision.sel8(), - is_phoscpv_readout, is_emc_readout, map_ncolls_per_bc[collision.bc().globalIndex()], + event(collision.globalIndex(), tag, bc.runNumber(), bc.triggerMask(), collision.sel8(), + is_phoscpv_readout, is_emc_readout, map_ncolls_per_bc[bc.globalIndex()], collision.posX(), collision.posY(), collision.posZ(), collision.numContrib(), collision.collisionTime(), collision.collisionTimeRes()); @@ -106,25 +109,25 @@ struct CreateEMEvent { map_ncolls_per_bc.clear(); } // end of skimEvent - void processEvent(MyCollisions const& collisions, aod::BCs const& bcs) + void processEvent(MyCollisions const& collisions, MyBCs const& bcs) { skimEvent(collisions, bcs); } PROCESS_SWITCH(CreateEMEvent, processEvent, "process event info", false); - void processEventMC(MyCollisionsMC const& collisions, aod::BCs const& bcs) + void processEventMC(MyCollisionsMC const& collisions, MyBCs const& bcs) { skimEvent(collisions, bcs); } PROCESS_SWITCH(CreateEMEvent, processEventMC, "process event info", false); - void processEvent_Cent(MyCollisions_Cent const& collisions, aod::BCs const& bcs) + void processEvent_Cent(MyCollisions_Cent const& collisions, MyBCs const& bcs) { skimEvent(collisions, bcs); } PROCESS_SWITCH(CreateEMEvent, processEvent_Cent, "process event info", false); - void processEventMC_Cent(MyCollisionsMC_Cent const& collisions, aod::BCs const& bcs) + void processEventMC_Cent(MyCollisionsMC_Cent const& collisions, MyBCs const& bcs) { skimEvent(collisions, bcs); }