@@ -60,7 +60,7 @@ using namespace o2::framework::expressions;
6060using namespace o2 ::aod;
6161using namespace o2 ::soa;
6262
63- // using MyEvents = soa::Join<aod::Collisions, aod::EvSels>
63+ // using MyEvents = soa::Join<aod::Collisions, aod::EvSels>
6464using MyEventsWithCent = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::CentFT0As, aod::CentFT0Ms>;
6565
6666using MyBarrelTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA,
@@ -69,8 +69,8 @@ using MyBarrelTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA,
6969 aod::pidTOFFullEl, aod::pidTOFFullPi, aod::pidTOFFullMu,
7070 aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta>;
7171
72- // constexpr static uint32_t EventFillMap = VarManager::ObjTypes::Collision;
73- constexpr static uint32_t EventFillMapWithCent = VarManager::ObjTypes::Collision| VarManager::ObjTypes::CollisionCent;
72+ // constexpr static uint32_t EventFillMap = VarManager::ObjTypes::Collision;
73+ constexpr static uint32_t EventFillMapWithCent = VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionCent;
7474constexpr static uint32_t TrackFillMap = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackPID;
7575
7676struct DalitzSelection {
@@ -129,7 +129,7 @@ struct DalitzSelection {
129129 std::map<int , uint8_t > fTrackmapProbe ; // whether it is selected with probe cut
130130 std::map<int , uint8_t > fDalitzmap ; // whether it is selected as dalitz decay daughter with symmetric or tag cut
131131 std::map<int , uint8_t > fDalitzmapProbe ; // whether it is selected as dalitz decay daughter with probe cut
132-
132+
133133 // maps to remove ambiguities
134134 std::map<int , uint8_t > fDalitzmapAmbiguity ;
135135 std::map<int , uint8_t > fDalitzmapProbeAmbiguity ;
@@ -316,8 +316,7 @@ struct DalitzSelection {
316316 VarManager::FillTrack<TTrackFillMap>(fullTrack);
317317 VarManager::FillTrackCollision<TTrackFillMap>(fullTrack, collision);
318318 fullTrackIdx = fullTrack.globalIndex ();
319- }
320- else {
319+ } else {
321320 VarManager::FillTrack<TTrackFillMap>(track1);
322321 fullTrackIdx = track1.globalIndex ();
323322 }
@@ -352,9 +351,9 @@ struct DalitzSelection {
352351 fDalitzmapAmbiguity = fDalitzmap ;
353352 fDalitzmapProbeAmbiguity = fDalitzmapProbe ;
354353 }
355-
354+
356355 for (const auto & [track1, track2] : o2::soa::combinations (CombinationsFullIndexPolicy (tracks1, tracks2))) {
357-
356+
358357 int trackIdx1;
359358 int trackIdx2;
360359 bool isLikeSign;
@@ -364,13 +363,12 @@ struct DalitzSelection {
364363 trackIdx1 = fullTrack1.globalIndex ();
365364 trackIdx2 = fullTrack2.globalIndex ();
366365 isLikeSign = (fullTrack1.sign () * fullTrack2.sign () > 0 );
367- }
368- else {
366+ } else {
369367 trackIdx1 = track1.globalIndex ();
370368 trackIdx2 = track2.globalIndex ();
371369 isLikeSign = (track1.sign () * track2.sign () > 0 );
372370 }
373-
371+
374372 if (trackIdx1 == trackIdx2) {
375373 continue ;
376374 }
@@ -391,12 +389,10 @@ struct DalitzSelection {
391389 auto const & fullTrack1 = track1.template track_as <MyBarrelTracks>();
392390 auto const & fullTrack2 = track2.template track_as <MyBarrelTracks>();
393391 VarManager::FillPair<TPairType, TTrackFillMap>(fullTrack1, fullTrack2);
394- }
395- else {
392+ } else {
396393 VarManager::FillPair<TPairType, TTrackFillMap>(track1, track2);
397394 }
398395
399-
400396 // Fill pair selection map and fill pair histogram
401397 int icut = 0 ;
402398 auto trackCut = fTrackCuts .begin ();
@@ -457,23 +453,22 @@ struct DalitzSelection {
457453 filterMap &= ~previousFilterMap;
458454 filterMapProbe &= ~previousFilterMapProbe;
459455 }
460-
456+
461457 if (!filterMap && !filterMapProbe) {
462458 continue ;
463459 }
464-
460+
465461 VarManager::FillTrack<TTrackFillMap>(fullTrack);
466462 // The caveat here is that we only fill the DCA to the first selected collision
467463 VarManager::FillTrackCollision<TTrackFillMap>(fullTrack, collision);
468- }
469- else {
464+ } else {
470465 filterMap = fDalitzmap [track.globalIndex ()];
471466 filterMapProbe = fDalitzmapProbe [track.globalIndex ()];
472-
467+
473468 if (!filterMap && !filterMapProbe) {
474469 continue ;
475470 }
476-
471+
477472 VarManager::FillTrack<TTrackFillMap>(track);
478473 }
479474
@@ -555,7 +550,7 @@ struct DalitzSelection {
555550 dalitzbits (fIsTagAndProbe ? fDalitzmapProbe [track.globalIndex ()] : fDalitzmap [track.globalIndex ()]);
556551 }
557552 }
558-
553+
559554 void processFullTracksWithAssoc (MyEventsWithCent const & collisions, aod::BCsWithTimestamps const &, MyBarrelTracks const & tracks, TrackAssoc const & trackAssocs)
560555 {
561556
@@ -621,7 +616,6 @@ struct DalitzSelection {
621616 for (const auto & track : tracks) { // Fill dalitz bits
622617 dalitzbits (fIsTagAndProbe ? fDalitzmapProbe [track.globalIndex ()] : fDalitzmap [track.globalIndex ()]);
623618 }
624-
625619 }
626620
627621 void processDummy (MyEventsWithCent const &)
0 commit comments