Skip to content

Commit 898c8f2

Browse files
FDUEnrichFDUEnrich
authored
Merge branch 'AliceO2Group:master' into master
2 parents 5d50aa5 + 81b5d7f commit 898c8f2

File tree

79 files changed

+5836
-9414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+5836
-9414
lines changed

‎ALICE3/TableProducer/OTF/onTheFlyTracker.cxx‎

Lines changed: 192 additions & 145 deletions
Large diffs are not rendered by default.

‎Common/DataModel/Centrality.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float); //! Run 3 cent. f
3333
DECLARE_SOA_COLUMN(CentFT0CVariant1, centFT0CVariant1, float); //! Run 3 cent. from FT0C multiplicity
3434
DECLARE_SOA_COLUMN(CentFT0CVariant2, centFT0CVariant2, float); //! Run 3 cent. from FT0C multiplicity, uses classical truncated Nancestors (NOT recommended, cross-check only!)
3535
DECLARE_SOA_COLUMN(CentFDDM, centFDDM, float); //! Run 3 cent. from FDDA+FDDC multiplicity
36-
DECLARE_SOA_COLUMN(CentNTPV, centNTPV, float); //! Run 3 cent. from the number of tracks contributing to the
37-
DECLARE_SOA_COLUMN(CentNGlobal, centNGlobal, float); //! Run 3 cent. from the number of tracks contributing to the PV
36+
DECLARE_SOA_COLUMN(CentNTPV, centNTPV, float); //! Run 3 cent. from the number of tracks contributing to the PV
37+
DECLARE_SOA_COLUMN(CentNGlobal, centNGlobal, float); //! Run 3 cent. from the number of global tracks
3838
DECLARE_SOA_COLUMN(CentMFT, centMFT, float); //! Run 3 cent. from the number of tracks in the MFT
3939
} // namespace cent
4040

‎PWGCF/Femto/FemtoNuclei/DataModel/PionNucleiTables.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ DECLARE_SOA_COLUMN(MultiplicityFT0C, multiplicityFT0C, float);
7777
} // namespace pion_nuclei_tables
7878

7979
DECLARE_SOA_TABLE(PionNucleiTable, "AOD", "PINUCLEITABLE",
80+
pion_nuclei_tables::PtPi,
81+
pion_nuclei_tables::PtNu,
82+
pion_nuclei_tables::InnerParamTPCPi,
83+
pion_nuclei_tables::InnerParamTPCNu,
8084
pion_nuclei_tables::TrackIDPi,
8185
pion_nuclei_tables::TrackIDNu)
8286
DECLARE_SOA_TABLE(PionHyperTable, "AOD", "PIHYPERTABLE",

‎PWGCF/Femto/FemtoNuclei/TableProducer/PiNucleiFemto.cxx‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,10 @@ struct PiNucleiFemto {
261261
{"hNuPt", "#it{p}_{T} distribution; #it{p}_{T} (GeV/#it{c})", {HistType::kTH1F, {{240, -6.0f, 6.0f}}}},
262262
{"hPiPt", "Pt distribution; #it{p}_{T} (GeV/#it{c})", {HistType::kTH1F, {{120, -3.0f, 3.0f}}}},
263263
{"hSingleNuPt", "#it{p}_{T} distribution; #it{p}_{T} (GeV/#it{c})", {HistType::kTH1F, {{240, -6.0f, 6.0f}}}},
264-
{"hSinglePiPt", "Pt distribution; #it{p}_{T} (GeV/#it{c})", {HistType::kTH1F, {{120, -3.0f, 3.0f}}}},
264+
{"hNuPin", "#it{p} distribution; #it{p} (GeV/#it{c})", {HistType::kTH1F, {{240, -6.0f, 6.0f}}}},
265+
{"hPiPin", "P distribution; #it{p} (GeV/#it{c})", {HistType::kTH1F, {{120, -4.0f, 4.0f}}}},
266+
{"hSingleNuPin", "#it{p} distribution; #it{p} (GeV/#it{c})", {HistType::kTH1F, {{240, -6.0f, 6.0f}}}},
267+
265268
{"hHe3TPCnsigma", "NsigmaHe3 TPC distribution; #it{p}_{T} (GeV/#it{c}); n#sigma_{TPC}(He3)", {HistType::kTH2F, {{100, -2.0f, 2.0f}, {200, -5.0f, 5.0f}}}},
266269
{"hHe3P", "Pin distribution; p (GeV/#it{c})", {HistType::kTH1F, {{120, -3.0f, 3.0f}}}},
267270
{"hHe3P_preselected", "Pin distribution_preselected; p (GeV/#it{c})", {HistType::kTH1F, {{120, -3.0f, 3.0f}}}},
@@ -291,8 +294,7 @@ struct PiNucleiFemto {
291294
{"hkStaVsmT_LS_A", ";kStar (GeV/c);mT (GeV/#it{c}^{2})", {HistType::kTH2F, {{300, 0.0f, 3.0f}, {2000, 0.8, 2.0}}}},
292295
{"hkStaVsmT_US_M", ";kStar (GeV/c);mT (GeV/#it{c}^{2})", {HistType::kTH2F, {{300, 0.0f, 3.0f}, {2000, 0.8, 2.0}}}},
293296
{"hkStaVsmT_US_A", ";kStar (GeV/c);mT (GeV/#it{c}^{2})", {HistType::kTH2F, {{300, 0.0f, 3.0f}, {2000, 0.8, 2.0}}}},
294-
{"hCollIDVsCentEachPion", ";CollisionID;Centrality", {HistType::kTH2F, {{4000, 0.0f, 4000.0f}, {100, 0.0f, 100.0f}}}},
295-
{"hCollIDVsCentEachDe", ";CollisionID;Centrality", {HistType::kTH2F, {{4000, 0.0f, 4000.0f}, {100, 0.0f, 100.0f}}}},
297+
296298
{"hNHypsPerPrevColl", "Number of V0Hypers in previous collision used for mixing;N_{V0Hypers};Entries", {HistType::kTH2F, {{4000, 0.0f, 4000.0f}, {50, -0.5, 49.5}}}},
297299
{"hkStar_LS_M", ";kStar (GeV/c)", {HistType::kTH1F, {{300, 0.0f, 3.0f}}}},
298300
{"hkStar_LS_A", ";kStar (GeV/c)", {HistType::kTH1F, {{300, 0.0f, 3.0f}}}},
@@ -815,9 +817,8 @@ struct PiNucleiFemto {
815817
}
816818

817819
template <typename Ttrack>
818-
void pairTracksSameEvent(const Ttrack& tracks, float cent)
820+
void pairTracksSameEvent(const Ttrack& tracks, float /*cent*/)
819821
{
820-
bool filledAllOnce = false;
821822
// LOG(info) << "Number of tracks: " << tracks.size();
822823
for (const auto& track0 : tracks) {
823824

@@ -833,7 +834,7 @@ struct PiNucleiFemto {
833834
}
834835
mQaRegistry.fill(HIST("hTrackSel"), Selections::kPID);
835836
mQaRegistry.fill(HIST("hSingleNuPt"), track0.pt() * track0.sign());
836-
mQaRegistry.fill(HIST("hCollIDVsCentEachDe"), track0.collisionId(), cent);
837+
mQaRegistry.fill(HIST("hSingleNuPin"), track0.tpcInnerParam() * track0.sign());
837838

838839
for (const auto& track1 : tracks) {
839840
if (track0 == track1) {
@@ -853,11 +854,6 @@ struct PiNucleiFemto {
853854
continue;
854855
}
855856

856-
if (!filledAllOnce) {
857-
mQaRegistry.fill(HIST("hCollIDVsCentEachPion"), track1.collisionId(), cent);
858-
mQaRegistry.fill(HIST("hSinglePiPt"), track1.pt() * track1.sign());
859-
}
860-
861857
SVCand trackPair;
862858
trackPair.tr0Idx = track0.globalIndex();
863859
trackPair.tr1Idx = track1.globalIndex();
@@ -866,7 +862,6 @@ struct PiNucleiFemto {
866862
trackPair.collBracket = collBracket;
867863
mTrackPairs.push_back(trackPair);
868864
}
869-
filledAllOnce = true;
870865
}
871866
}
872867

@@ -952,6 +947,10 @@ struct PiNucleiFemto {
952947
void fillTable(const PiNucandidate& piNucand, const Tcoll& collision)
953948
{
954949
mOutputDataTable(
950+
piNucand.recoPtPi(),
951+
piNucand.recoPtNu(),
952+
piNucand.momPiTPC,
953+
piNucand.momNuTPC,
955954
piNucand.trackIDPi,
956955
piNucand.trackIDNu);
957956
if (settingFillMultiplicity) {
@@ -1007,6 +1006,8 @@ struct PiNucleiFemto {
10071006
{
10081007
mQaRegistry.fill(HIST("hNuPt"), piNucand.recoPtNu());
10091008
mQaRegistry.fill(HIST("hPiPt"), piNucand.recoPtPi());
1009+
mQaRegistry.fill(HIST("hNuPin"), piNucand.momNuTPC * piNucand.signNu);
1010+
mQaRegistry.fill(HIST("hPiPin"), piNucand.momPiTPC * piNucand.signPi);
10101011
mQaRegistry.fill(HIST("hNuEta"), piNucand.recoEtaNu());
10111012
mQaRegistry.fill(HIST("hPiEta"), piNucand.recoEtaPi());
10121013
mQaRegistry.fill(HIST("hNuPhi"), piNucand.recoPhiNu());

‎PWGCF/FemtoDream/Tasks/femtoDreamPairTaskV0Reso.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ struct FemtoDreamPairTaskV0Reso {
201201
/// Partitions for K0Short and KStar
202202

203203
/// Partition for particle K0Short
204-
Partition<aod::FDParticles> partitionK0Short1 = (aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kV0)) &&
204+
Partition<aod::FDParticles> partitionK0Short1 = (aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kV0K0Short)) &&
205205
((aod::femtodreamparticle::cut & V01.cutBit) == V01.cutBit) &&
206206
(aod::femtodreamparticle::pt > V01.ptMin) &&
207207
(aod::femtodreamparticle::pt < V01.ptMax) &&
@@ -213,10 +213,10 @@ struct FemtoDreamPairTaskV0Reso {
213213
(aod::femtodreamparticle::mAntiLambda < V01.invMassAntiMax);
214214

215215
/// Partition for particle KStar
216-
Partition<aod::FDParticles> partitionKStar2 = (ifnode(aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kResoPosdaughTPC_NegdaughTPC), ncheckbit(aod::femtodreamparticle::pidcut, Reso2.daughPosTPCBit) && ncheckbit(aod::femtodreamparticle::cut, Reso2.daughNegMergedTPCBit), false) ||
217-
ifnode(aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kResoPosdaughTOF_NegdaughTOF), ncheckbit(aod::femtodreamparticle::pidcut, Reso2.daughPosTPCTOFBit) && ncheckbit(aod::femtodreamparticle::cut, Reso2.daughNegMergedTPCTOFBit), false) ||
218-
ifnode(aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kResoPosdaughTOF_NegdaughTPC), ncheckbit(aod::femtodreamparticle::pidcut, Reso2.daughPosTPCTOFBit) && ncheckbit(aod::femtodreamparticle::cut, Reso2.daughNegMergedTPCBit), false) ||
219-
ifnode(aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kResoPosdaughTPC_NegdaughTOF), ncheckbit(aod::femtodreamparticle::pidcut, Reso2.daughPosTPCBit) && ncheckbit(aod::femtodreamparticle::cut, Reso2.daughNegMergedTPCTOFBit), false)) &&
216+
Partition<aod::FDParticles> partitionKStar2 = (ifnode(aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kResoKStarPosdaughTPC_NegdaughTPC), ncheckbit(aod::femtodreamparticle::pidcut, Reso2.daughPosTPCBit) && ncheckbit(aod::femtodreamparticle::cut, Reso2.daughNegMergedTPCBit), false) ||
217+
ifnode(aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kResoKStarPosdaughTOF_NegdaughTOF), ncheckbit(aod::femtodreamparticle::pidcut, Reso2.daughPosTPCTOFBit) && ncheckbit(aod::femtodreamparticle::cut, Reso2.daughNegMergedTPCTOFBit), false) ||
218+
ifnode(aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kResoKStarPosdaughTOF_NegdaughTPC), ncheckbit(aod::femtodreamparticle::pidcut, Reso2.daughPosTPCTOFBit) && ncheckbit(aod::femtodreamparticle::cut, Reso2.daughNegMergedTPCBit), false) ||
219+
ifnode(aod::femtodreamparticle::partType == uint8_t(aod::femtodreamparticle::ParticleType::kResoKStarPosdaughTPC_NegdaughTOF), ncheckbit(aod::femtodreamparticle::pidcut, Reso2.daughPosTPCBit) && ncheckbit(aod::femtodreamparticle::cut, Reso2.daughNegMergedTPCTOFBit), false)) &&
220220
(aod::femtodreamparticle::pt < Reso2.ptMax) &&
221221
(aod::femtodreamparticle::eta > Reso2.etaMin) &&
222222
(aod::femtodreamparticle::eta < Reso2.etaMax) &&

‎PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ class FemtoUniverseDetaDphiStar
910910
double afsi1b = deltaphiconstFD * magfield * charge2 * chosenRadii / part2.pt();
911911
double dphis = 0.0;
912912

913-
if (std::abs(afsi0b) < 1.0 && std::abs(afsi0b) < 1.0) {
913+
if (std::abs(afsi0b) < 1.0 && std::abs(afsi1b) < 1.0) {
914914
dphis = part2.phi() - part1.phi() + std::asin(afsi1b) - std::asin(afsi0b);
915915
}
916916
return dphis;

‎PWGCF/Flow/Tasks/flowGfwEse.cxx‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ struct FlowGfwEse {
244244
O2_DEFINE_CONFIGURABLE(cfgAnalysisType, bool, true, "true for ese, false for mean-pT");
245245
const std::string shapesel = cfgAnalysisType ? "ese" : "mpt";
246246
static constexpr int EseBins = 100;
247+
static constexpr float MeanPtThr = -998.0;
247248

248249
// region indices for consistency flag
249250
int posRegionIndex = -1;
@@ -628,7 +629,7 @@ struct FlowGfwEse {
628629
return 0;
629630
}
630631
registry.fill(HIST("eventQA/eventSel"), kTVXTRD);
631-
if (cfgRunByRun)
632+
if (cfgRunByRun && run != -1)
632633
th1sList[run][hEventSel]->Fill(kTVXTRD);
633634
}
634635
if (cfgNoSameBunchPileupCut) {
@@ -638,7 +639,7 @@ struct FlowGfwEse {
638639
return 0;
639640
}
640641
registry.fill(HIST("eventQA/eventSel"), kNoSamebunchPU);
641-
if (cfgRunByRun)
642+
if (cfgRunByRun && run != -1)
642643
th1sList[run][hEventSel]->Fill(kNoSamebunchPU);
643644
}
644645
if (cfgIsGoodZvtxFT0vsPV) {
@@ -648,7 +649,7 @@ struct FlowGfwEse {
648649
return 0;
649650
}
650651
registry.fill(HIST("eventQA/eventSel"), kZVtxFT0PV);
651-
if (cfgRunByRun)
652+
if (cfgRunByRun && run != -1)
652653
th1sList[run][hEventSel]->Fill(kZVtxFT0PV);
653654
}
654655
if (cfgNoCollInTimeRangeStandard) {
@@ -657,7 +658,7 @@ struct FlowGfwEse {
657658
return 0;
658659
}
659660
registry.fill(HIST("eventQA/eventSel"), kNoCollTRStd);
660-
if (cfgRunByRun)
661+
if (cfgRunByRun && run != -1)
661662
th1sList[run][hEventSel]->Fill(kNoCollTRStd);
662663
}
663664

@@ -667,7 +668,7 @@ struct FlowGfwEse {
667668
return 0;
668669
}
669670
registry.fill(HIST("eventQA/eventSel"), kVtxITSTPC);
670-
if (cfgRunByRun)
671+
if (cfgRunByRun && run != -1)
671672
th1sList[run][hEventSel]->Fill(kVtxITSTPC);
672673
}
673674

@@ -676,7 +677,7 @@ struct FlowGfwEse {
676677
return 0;
677678
}
678679
registry.fill(HIST("eventQA/eventSel"), kGoodITSLayers);
679-
if (cfgRunByRun)
680+
if (cfgRunByRun && run != -1)
680681
th1sList[run][hEventSel]->Fill(kGoodITSLayers);
681682
}
682683

@@ -715,7 +716,7 @@ struct FlowGfwEse {
715716
if (!(cfgGlobalAsideCorrCuts.cfgMultGlobalASideCorrCutFunction->empty()) && static_cast<double>(collision.multFT0A()) > fMultGlobalT0ACutHigh->Eval(multTrk))
716717
return 0;
717718
registry.fill(HIST("eventQA/eventSel"), kMultCuts);
718-
if (cfgRunByRun)
719+
if (cfgRunByRun && run != -1)
719720
th1sList[run][hEventSel]->Fill(kMultCuts);
720721
}
721722
return 1;
@@ -1200,18 +1201,34 @@ struct FlowGfwEse {
12001201
}
12011202
PROCESS_SWITCH(FlowGfwEse, processData, "Process analysis for non-derived data", true);
12021203

1203-
// void processMptq2(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentFV0As, aod::CentNTPVs, aod::CentNGlobals, aod::CentMFTs, aod::Qvectors, aod::QPercentileFT0Cs/*, aod::MeanPtShape*/>::iterator const& collision, aod::BCsWithTimestamps const&, GFWTracks const& tracks)
1204-
1205-
void processMptq2(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentFV0As, aod::CentNTPVs, aod::CentNGlobals, aod::CentMFTs, aod::Qvectors, aod::QPercentileFT0Cs, aod::MeanPtShapes, aod::MeanPts>>::iterator const& collision, aod::BCsWithTimestamps const& /*, GFWTracks const& tracks*/)
1204+
void processMptq2(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentFV0As, aod::CentNTPVs, aod::CentNGlobals, aod::CentMFTs, aod::Qvectors, aod::QPercentileFT0Cs, aod::MeanPtShapes, aod::MeanPts>>::iterator const& collision, aod::BCsWithTimestamps const&, GFWTracks const& tracks)
12061205
{
12071206
float count{0.5};
12081207
registry.fill(HIST("mptcorr/eventcounter"), count++);
1208+
if (!collision.sel8()) {
1209+
return;
1210+
}
1211+
registry.fill(HIST("mptcorr/eventcounter"), count++);
1212+
if (cfgDoOccupancySel) {
1213+
int occupancy = collision.trackOccupancyInTimeRange();
1214+
if (occupancy < 0 || occupancy > cfgOccupancySelection) {
1215+
return;
1216+
}
1217+
}
1218+
registry.fill(HIST("mptcorr/eventcounter"), count++);
1219+
12091220
const auto centr = collision.centFT0C();
12101221
const auto qPerc = collision.qPERCFT0C();
12111222
const auto mPt = collision.fMEANPTSHAPE();
12121223
const auto mPtv = collision.fMEANPT();
12131224
if (qPerc[0] < 0 || mPt[0] < 0)
12141225
return;
1226+
if (mPtv[0] < MeanPtThr)
1227+
return;
1228+
const XAxis xaxis{getCentrality(collision), tracks.size(), -1.0};
1229+
if (cfgUseAdditionalEventCut && !eventSelected(collision, xaxis.multiplicity, xaxis.centrality, -1))
1230+
return;
1231+
12151232
registry.fill(HIST("mptcorr/eventcounter"), count++);
12161233
registry.fill(HIST("mptcorr/h3_cent_q2_meanptperc"), centr, qPerc[0], mPt[0]);
12171234
registry.fill(HIST("mptcorr/h3_cent_q2_mptvalue"), centr, qPerc[0], mPtv[0]);

‎PWGCF/Tasks/correlations.cxx‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -457,10 +457,6 @@ struct CorrelationTask {
457457
template <class T>
458458
using HasPartDaugh1Id = decltype(std::declval<T&>().cfParticleDaugh1Id());
459459

460-
/*
461-
OO outlier cut (requires mask 15):
462-
(567.785+172.715*[mGlob]+0.77888*[mGlob]*[mGlob]+-0.00693466*[mGlob]*[mGlob]*[mGlob]+1.40564e-05*[mGlob]*[mGlob]*[mGlob]*[mGlob] + 3.5*(679.853+66.8068*[mGlob]+-0.444332*[mGlob]*[mGlob]+0.00115002*[mGlob]*[mGlob]*[mGlob]+-4.92064e-07*[mGlob]*[mGlob]*[mGlob]*[mGlob])) > [mFV0A] && (567.785+172.715*[mGlob]+0.77888*[mGlob]*[mGlob]+-0.00693466*[mGlob]*[mGlob]*[mGlob]+1.40564e-05*[mGlob]*[mGlob]*[mGlob]*[mGlob] - 3.0*(679.853+66.8068*[mGlob]+-0.444332*[mGlob]*[mGlob]+0.00115002*[mGlob]*[mGlob]*[mGlob]+-4.92064e-07*[mGlob]*[mGlob]*[mGlob]*[mGlob])) < [mFV0A] && (172.406 + -4.50219*[cFT0C] + 0.0543038*[cFT0C]*[cFT0C] + -0.000373213*[cFT0C]*[cFT0C]*[cFT0C] + 1.15322e-06*[cFT0C]*[cFT0C]*[cFT0C]*[cFT0C] + 4.0*(49.7503 + -1.29008*[cFT0C] + 0.0160059*[cFT0C]*[cFT0C] + -7.86846e-05*[cFT0C]*[cFT0C]*[cFT0C])) > [mPV] && (172.406 + -4.50219*[cFT0C] + 0.0543038*[cFT0C]*[cFT0C] + -0.000373213*[cFT0C]*[cFT0C]*[cFT0C] + 1.15322e-06*[cFT0C]*[cFT0C]*[cFT0C]*[cFT0C] - 2.5*(49.7503 + -1.29008*[cFT0C] + 0.0160059*[cFT0C]*[cFT0C] + -7.86846e-05*[cFT0C]*[cFT0C]*[cFT0C])) < [mPV] && (125.02 + -3.30255*[cFT0C] + 0.0398663*[cFT0C]*[cFT0C] + -0.000271942*[cFT0C]*[cFT0C]*[cFT0C] + 8.34098e-07*[cFT0C]*[cFT0C]*[cFT0C]*[cFT0C] + 4.0*(37.0244 + -0.949883*[cFT0C] + 0.0116622*[cFT0C]*[cFT0C] + -5.71117e-05*[cFT0C]*[cFT0C]*[cFT0C])) > [mGlob] && (125.02 + -3.30255*[cFT0C] + 0.0398663*[cFT0C]*[cFT0C] + -0.000271942*[cFT0C]*[cFT0C]*[cFT0C] + 8.34098e-07*[cFT0C]*[cFT0C]*[cFT0C]*[cFT0C] - 2.5*(37.0244 + -0.949883*[cFT0C] + 0.0116622*[cFT0C]*[cFT0C] + -5.71117e-05*[cFT0C]*[cFT0C]*[cFT0C])) < [mGlob] && (-0.223013 + 0.715849*[mPV] + 3*(0.664242 + 0.0829653*[mPV] + -0.000503733*[mPV]*[mPV] + 1.21185e-06*[mPV]*[mPV]*[mPV])) > [mGlob]
463-
*/
464460
template <class CollType>
465461
bool passOutlier(CollType const& collision)
466462
{
@@ -1180,6 +1176,7 @@ struct CorrelationTask {
11801176
if (!passMLScore(p2track))
11811177
continue;
11821178
}
1179+
same->getTrackHistEfficiency()->Fill(CorrelationContainer::RecoAll, p2track.eta(), p2track.pt(), 4, multiplicity, mcCollision.posZ());
11831180
auto fillMC2p = [&](const aod::CFTracksWithLabel::iterator& p) -> bool {
11841181
if (!p.has_cfMCParticle())
11851182
return false;
@@ -1191,7 +1188,6 @@ struct CorrelationTask {
11911188
return false;
11921189
const auto& mcParticle = mcParticles.iteratorAt(*m - mcParticles.begin().globalIndex());
11931190
same->getTrackHistEfficiency()->Fill(CorrelationContainer::RecoPrimaries, mcParticle.eta(), mcParticle.pt(), 4, multiplicity, mcCollision.posZ());
1194-
same->getTrackHistEfficiency()->Fill(CorrelationContainer::RecoAll, mcParticle.eta(), mcParticle.pt(), 4, multiplicity, mcCollision.posZ());
11951191
return true;
11961192
};
11971193
if (p2track.has_cfTrackProng0()) {
@@ -1204,11 +1200,6 @@ struct CorrelationTask {
12041200
continue;
12051201
}
12061202

1207-
// alternatively, book the reco pTs directly
1208-
// same->getTrackHistEfficiency()->Fill(CorrelationContainer::RecoPrimaries, p2track.eta(), p2track.pt(), 4, multiplicity, mcCollision.posZ());
1209-
// same->getTrackHistEfficiency()->Fill(CorrelationContainer::RecoAll, p2track.eta(), p2track.pt(), 4, multiplicity, mcCollision.posZ());
1210-
// continue;
1211-
12121203
// fake track
12131204
same->getTrackHistEfficiency()->Fill(CorrelationContainer::Fake, p2track.eta(), p2track.pt(), 4, multiplicity, mcCollision.posZ());
12141205
}

0 commit comments

Comments
 (0)