Skip to content

Commit 069b2a3

Browse files
abmodakabmodak
authored
Fix o2 compilation error
1 parent 5f4820c commit 069b2a3

File tree

1 file changed

+21
-26
lines changed

1 file changed

+21
-26
lines changed

‎PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,8 @@ struct LongrangeCorrelation {
142142
using CollTable = soa::Join<aod::Collisions, aod::EvSels>;
143143
using TrksTable = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection>>;
144144
using MftTrkTable = soa::Filtered<aod::MFTTracks>;
145-
using MftTrkTable2 = soa::SmallGroups<aod::BestCollisionsFwd3d>;
146-
using MftBestTrkTable = soa::Filtered<MftTrkTable2>;
147145
Preslice<TrksTable> perColGlobal = aod::track::collisionId;
148146
Preslice<MftTrkTable> perColMft = aod::fwdtrack::collisionId;
149-
PresliceUnsorted<MftBestTrkTable> perColBestMft = aod::fwdtrack::bestCollisionId;
150147
o2::ft0::Geometry ft0Det;
151148

152149
OutputObj<CorrelationContainer> sameFt0aGlobal{Form("sameEventFt0aGlobal_%i_%i", static_cast<int>(cfgMinMult), static_cast<int>(cfgMaxMult))};
@@ -420,28 +417,27 @@ struct LongrangeCorrelation {
420417
histos.fill(HIST("MftGlobal/SE/Trig_hist"), fSampleIndex, vz, triggerTrack.pt());
421418

422419
for (auto const& assoTrack : mft) {
423-
auto bestMftTrack = assoTrack.template mfttrack_as<MftTrkTable>();
424-
if (!isMftTrackSelected(bestMftTrack)) {
420+
if (!isMftTrackSelected(assoTrack)) {
425421
continue;
426422
}
427-
auto phi = bestMftTrack.phi();
423+
auto phi = assoTrack.phi();
428424
o2::math_utils::bringTo02Pi(phi);
429425
if (mixing) {
430-
histos.fill(HIST("MftGlobal/ME/Assoc_eta"), bestMftTrack.eta());
426+
histos.fill(HIST("MftGlobal/ME/Assoc_eta"), assoTrack.eta());
431427
histos.fill(HIST("MftGlobal/ME/Assoc_phi"), phi);
432-
histos.fill(HIST("MftGlobal/ME/Assoc_etavsphi"), phi, bestMftTrack.eta());
428+
histos.fill(HIST("MftGlobal/ME/Assoc_etavsphi"), phi, assoTrack.eta());
433429
} else {
434-
histos.fill(HIST("MftGlobal/SE/Assoc_eta"), bestMftTrack.eta());
430+
histos.fill(HIST("MftGlobal/SE/Assoc_eta"), assoTrack.eta());
435431
histos.fill(HIST("MftGlobal/SE/Assoc_phi"), phi);
436-
histos.fill(HIST("MftGlobal/SE/Assoc_etavsphi"), phi, bestMftTrack.eta());
432+
histos.fill(HIST("MftGlobal/SE/Assoc_etavsphi"), phi, assoTrack.eta());
437433
}
438434
float deltaPhi = RecoDecay::constrainAngle(triggerTrack.phi() - phi, -PIHalf);
439-
float deltaEta = triggerTrack.eta() - bestMftTrack.eta();
435+
float deltaEta = triggerTrack.eta() - assoTrack.eta();
440436
if (mixing)
441437
histos.fill(HIST("MftGlobal/ME/deltaEta_deltaPhi"), deltaPhi, deltaEta);
442438
else
443439
histos.fill(HIST("MftGlobal/SE/deltaEta_deltaPhi"), deltaPhi, deltaEta);
444-
target->getPairHist()->Fill(step, fSampleIndex, vz, triggerTrack.pt(), bestMftTrack.pt(), deltaPhi, deltaEta);
440+
target->getPairHist()->Fill(step, fSampleIndex, vz, triggerTrack.pt(), assoTrack.pt(), deltaPhi, deltaEta);
445441
} // associated mft tracks
446442
} // trigger tracks
447443
} // fillCorrMftGlobal
@@ -453,14 +449,13 @@ struct LongrangeCorrelation {
453449
if (!mixing)
454450
histos.fill(HIST("Ft0aMft/SE/hMult_used"), tracks.size());
455451
for (auto const& triggerTrack : triggers) {
456-
auto bestMftTrack = triggerTrack.template mfttrack_as<MftTrkTable>();
457-
if (!isMftTrackSelected(bestMftTrack)) {
452+
if (!isMftTrackSelected(triggerTrack)) {
458453
continue;
459454
}
460455
if (!mixing)
461-
histos.fill(HIST("Ft0aMft/SE/Trig_hist"), fSampleIndex, vz, bestMftTrack.pt());
456+
histos.fill(HIST("Ft0aMft/SE/Trig_hist"), fSampleIndex, vz, triggerTrack.pt());
462457

463-
auto trigphi = bestMftTrack.phi();
458+
auto trigphi = triggerTrack.phi();
464459
o2::math_utils::bringTo02Pi(trigphi);
465460

466461
for (std::size_t iCh = 0; iCh < ft0.channelA().size(); iCh++) {
@@ -486,12 +481,12 @@ struct LongrangeCorrelation {
486481
}
487482

488483
float deltaPhi = RecoDecay::constrainAngle(trigphi - phi, -PIHalf);
489-
float deltaEta = bestMftTrack.eta() - eta;
484+
float deltaEta = triggerTrack.eta() - eta;
490485
if (mixing)
491486
histos.fill(HIST("Ft0aMft/ME/deltaEta_deltaPhi"), deltaPhi, deltaEta);
492487
else
493488
histos.fill(HIST("Ft0aMft/SE/deltaEta_deltaPhi"), deltaPhi, deltaEta);
494-
target->getPairHist()->Fill(step, fSampleIndex, vz, bestMftTrack.pt(), bestMftTrack.pt(), deltaPhi, deltaEta);
489+
target->getPairHist()->Fill(step, fSampleIndex, vz, triggerTrack.pt(), triggerTrack.pt(), deltaPhi, deltaEta);
495490
} // associated ft0 tracks
496491
} // trigger tracks
497492
} // fillCorrFt0aMft
@@ -606,7 +601,7 @@ struct LongrangeCorrelation {
606601
}
607602
} // same event
608603

609-
void processMftGlobalSE(CollTable::iterator const& col, MftBestTrkTable const& mfttracks, MftTrkTable const&, TrksTable const& tracks)
604+
void processMftGlobalSE(CollTable::iterator const& col, MftTrkTable const& mfttracks, TrksTable const& tracks)
610605
{
611606
if (!isEventSelected(col)) {
612607
return;
@@ -618,7 +613,7 @@ struct LongrangeCorrelation {
618613
fillCorrMftGlobal<CorrelationContainer::kCFStepReconstructed>(sameMftGlobal, tracks, mfttracks, false, col.posZ());
619614
} // same event
620615

621-
void processFt0aMftSE(CollTable::iterator const& col, aod::FT0s const&, TrksTable const& tracks, MftBestTrkTable const& mfttracks, MftTrkTable const&)
616+
void processFt0aMftSE(CollTable::iterator const& col, aod::FT0s const&, TrksTable const& tracks, MftTrkTable const& mfttracks)
622617
{
623618
if (!isEventSelected(col)) {
624619
return;
@@ -639,7 +634,7 @@ struct LongrangeCorrelation {
639634
return;
640635
}
641636
if (col.has_foundFT0()) {
642-
histos.fill("Ft0aFt0c/SE/hMult", tracks.size());
637+
histos.fill(HIST("Ft0aFt0c/SE/hMult"), tracks.size());
643638
const auto& ft0 = col.foundFT0();
644639
if (tracks.size() < cfgMinMult || tracks.size() >= cfgMaxMult) {
645640
return;
@@ -704,7 +699,7 @@ struct LongrangeCorrelation {
704699
}
705700
} // mixed event
706701

707-
void processMftGlobalME(CollTable const& col, MftBestTrkTable const& mfttracks, MftTrkTable const&, TrksTable const& tracks)
702+
void processMftGlobalME(CollTable const& col, MftTrkTable const& mfttracks, TrksTable const& tracks)
708703
{
709704
auto getTracksSize = [&tracks, this](CollTable::iterator const& collision) {
710705
auto associatedTracks = tracks.sliceByCached(o2::aod::track::collisionId, collision.globalIndex(), this->cache);
@@ -714,7 +709,7 @@ struct LongrangeCorrelation {
714709
using MixedBinning = FlexibleBinningPolicy<std::tuple<decltype(getTracksSize)>, aod::collision::PosZ, decltype(getTracksSize)>;
715710
MixedBinning binningOnVtxAndMult{{getTracksSize}, {axisVtxZME, axisMultME}, true};
716711
auto tracksTuple = std::make_tuple(tracks, mfttracks);
717-
Pair<CollTable, TrksTable, MftBestTrkTable, MixedBinning> pairs{binningOnVtxAndMult, mixingParameter, -1, col, tracksTuple, &cache};
712+
Pair<CollTable, TrksTable, MftTrkTable, MixedBinning> pairs{binningOnVtxAndMult, mixingParameter, -1, col, tracksTuple, &cache};
718713
for (auto const& [col1, tracks1, col2, tracks2] : pairs) {
719714
if (!isEventSelected(col1) || !isEventSelected(col2)) {
720715
continue;
@@ -726,7 +721,7 @@ struct LongrangeCorrelation {
726721
}
727722
} // mixed event
728723

729-
void processFt0aMftME(CollTable const& col, aod::FT0s const&, TrksTable const& tracks, MftBestTrkTable const& mfttracks, MftTrkTable const&)
724+
void processFt0aMftME(CollTable const& col, aod::FT0s const&, TrksTable const& tracks, MftTrkTable const& mfttracks)
730725
{
731726
auto getTracksSize = [&tracks, this](CollTable::iterator const& collision) {
732727
auto associatedTracks = tracks.sliceByCached(o2::aod::track::collisionId, collision.globalIndex(), this->cache);
@@ -744,7 +739,7 @@ struct LongrangeCorrelation {
744739
}
745740
if (col1.has_foundFT0() && col2.has_foundFT0()) {
746741
auto slicedGlobalTracks = tracks.sliceBy(perColGlobal, col1.globalIndex());
747-
auto slicedTriggerMftTracks = mfttracks.sliceBy(perColBestMft, col1.globalIndex());
742+
auto slicedTriggerMftTracks = mfttracks.sliceBy(perColMft, col1.globalIndex());
748743
fillYield<kFT0AMFT, kME>(slicedTriggerMftTracks);
749744
const auto& ft0 = col2.foundFT0();
750745
if (slicedGlobalTracks.size() < cfgMinMult || slicedGlobalTracks.size() >= cfgMaxMult) {
@@ -773,7 +768,7 @@ struct LongrangeCorrelation {
773768
}
774769
if (col1.has_foundFT0() && col2.has_foundFT0()) {
775770
auto slicedTriggerTracks = tracks.sliceBy(perColGlobal, col1.globalIndex());
776-
histos.fill("Ft0aFt0c/ME/hMult", slicedTriggerTracks.size());
771+
histos.fill(HIST("Ft0aFt0c/ME/hMult"), slicedTriggerTracks.size());
777772
const auto& ft0a = col1.foundFT0();
778773
const auto& ft0c = col2.foundFT0();
779774
if (slicedTriggerTracks.size() < cfgMinMult || slicedTriggerTracks.size() >= cfgMaxMult) {

0 commit comments

Comments
 (0)