@@ -3264,10 +3264,10 @@ struct AnalysisDileptonTrackTrack {
32643264
32653265 if (isDummy) {
32663266 if (isPsi2S || isX3872 || isMCGen) {
3267- LOG (fatal) << " Dummy function is enabled even if there are normal process functions running! Fix your config!" << endl ;
3267+ LOG (fatal) << " Dummy function is enabled even if there are normal process functions running! Fix your config!" ;
32683268 return ;
32693269 } else {
3270- LOG (info) << " Dummy function is enabled. Skipping the rest of the init function" << endl ;
3270+ LOG (info) << " Dummy function is enabled. Skipping the rest of the init function" ;
32713271 return ;
32723272 }
32733273 }
@@ -3398,7 +3398,7 @@ struct AnalysisDileptonTrackTrack {
33983398 void initParamsFromCCDB (uint64_t timestamp)
33993399 {
34003400 if (fConfigCCDBOptions .fConfigUseRemoteField .value ) {
3401- o2::parameters::GRPMagField* grpmag = fCCDB ->getForTimeStamp <o2::parameters::GRPMagField>(fConfigGRPmagPath .value , timestamp);
3401+ o2::parameters::GRPMagField* grpmag = fCCDB ->getForTimeStamp <o2::parameters::GRPMagField>(fConfigCCDBOptions . fConfigGRPmagPath .value , timestamp);
34023402 float magField = 0.0 ;
34033403 if (grpmag != nullptr ) {
34043404 magField = grpmag->getNominalL3Field ();
@@ -3576,7 +3576,7 @@ struct AnalysisDileptonTrackTrack {
35763576 } // end loop over dileptons
35773577 }
35783578
3579- Preslice<aod:: soa::Join<aod::TrackAssoc, aod::BarrelTrackCuts>> trackAssocsPerCollision = aod::reducedtrack_association::reducedeventId;
3579+ Preslice<soa::Join<aod::TrackAssoc, aod::BarrelTrackCuts>> trackAssocsPerCollision = aod::reducedtrack_association::reducedeventId;
35803580 Preslice<MyDielectronCandidates> dielectronsPerCollision = aod::reducedpair::reducedeventId;
35813581 // Preslice<MyDitrackCandidates> ditracksPerCollision = aod::reducedpair::reducedeventId;
35823582
@@ -3599,7 +3599,7 @@ struct AnalysisDileptonTrackTrack {
35993599 }
36003600 auto groupedBarrelAssocs = assocs.sliceBy (trackAssocsPerCollision, event.globalIndex ());
36013601 auto groupedDielectrons = dileptons.sliceBy (dielectronsPerCollision, event.globalIndex ());
3602- runDileptonTrackTrack<VarManager::kXtoJpsiPiPi , gkEventFillMapWithCov , gkTrackFillMapWithCov>(event, groupedBarrelAssocs, tracks, groupedDielectrons, mcEvents, mcTracks);
3602+ runDileptonTrackTrack<VarManager::kXtoJpsiPiPi , gkEventFillMapWithMults , gkTrackFillMapWithCov>(event, groupedBarrelAssocs, tracks, groupedDielectrons, mcEvents, mcTracks);
36033603 }
36043604 }
36053605
@@ -3622,7 +3622,7 @@ struct AnalysisDileptonTrackTrack {
36223622 }
36233623 auto groupedBarrelAssocs = assocs.sliceBy (trackAssocsPerCollision, event.globalIndex ());
36243624 auto groupedDielectrons = dileptons.sliceBy (dielectronsPerCollision, event.globalIndex ());
3625- runDileptonTrackTrack<VarManager::kPsi2StoJpsiPiPi , gkEventFillMapWithCov , gkTrackFillMapWithCov>(event, groupedBarrelAssocs, tracks, groupedDielectrons, mcEvents, mcTracks);
3625+ runDileptonTrackTrack<VarManager::kPsi2StoJpsiPiPi , gkEventFillMapWithMults , gkTrackFillMapWithCov>(event, groupedBarrelAssocs, tracks, groupedDielectrons, mcEvents, mcTracks);
36263626 }
36273627 }
36283628
@@ -3681,11 +3681,11 @@ struct AnalysisDileptonTrackTrack {
36813681 if (!event.isEventSelected_bit (0 )) {
36823682 continue ;
36833683 }
3684- if (!event.has_reducedMCevent ()) {
3684+ if (!event.has_mcCollision ()) {
36853685 continue ;
36863686 }
36873687
3688- auto groupedMCTracks = mcTracks.sliceBy (perReducedMcEvent, event.reducedMCeventId ());
3688+ auto groupedMCTracks = mcTracks.sliceBy (perReducedMcEvent, event.mcCollisionId ());
36893689 groupedMCTracks.bindInternalIndicesTo (&mcTracks);
36903690 for (auto & track : groupedMCTracks) {
36913691
0 commit comments