Skip to content

Commit 275caed

Browse files
committed
add the missing header
1 parent a2c0793 commit 275caed

File tree

3 files changed

+16
-39
lines changed

3 files changed

+16
-39
lines changed

PWGCF/FemtoDream/Core/femtoDreamContainer.h

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,12 @@ class FemtoDreamContainer
7272
/// \param kTAxis axis object for the kT axis
7373
/// \param mTAxis axis object for the mT axis
7474

75-
template <bool isHF = false, typename T>
75+
template <typename T>
7676
void init_base(std::string folderName, std::string femtoObs,
7777
T& femtoObsAxis, T& pTAxis, T& kTAxis, T& mTAxis, T& multAxis, T& multPercentileAxis,
7878
T& /*kstarAxis4D*/, T& mTAxis4D, T& multAxis4D, T& multPercentileAxis4D,
7979
bool use4dplots, bool extendedplots, T& mP2Axis)
8080
{
81-
82-
if constexpr (isHF) {
83-
mHistogramRegistry->add((folderName + "/relPairkstarmP2").c_str(), ("; " + femtoObs + "; Mass (GeV)").c_str(), kTH2F, {femtoObsAxis, mP2Axis});
84-
}
85-
8681
mHistogramRegistry->add((folderName + "/relPairDist").c_str(), ("; " + femtoObs + "; Entries").c_str(), kTH1F, {femtoObsAxis});
8782
mHistogramRegistry->add((folderName + "/relPairkT").c_str(), "; #it{k}_{T} (GeV/#it{c}); Entries", kTH1F, {kTAxis});
8883
mHistogramRegistry->add((folderName + "/relPairkstarkT").c_str(), ("; " + femtoObs + "; #it{k}_{T} (GeV/#it{c})").c_str(), kTH2F, {femtoObsAxis, kTAxis});
@@ -138,7 +133,7 @@ class FemtoDreamContainer
138133
/// \param kTBins kT binning for the histograms
139134
/// \param mTBins mT binning for the histograms
140135
/// \param isMC add Monte Carlo truth histograms to the output file
141-
template <bool isHF = false, typename T>
136+
template <typename T>
142137
void init(HistogramRegistry* registry,
143138
T& kstarBins, T& pTBins, T& kTBins, T& mTBins, T& multBins, T& /*multPercentileBins*/,
144139
T& kstarBins4D, T& mTBins4D, T& multBins4D, T& multPercentileBins4D,
@@ -168,17 +163,17 @@ class FemtoDreamContainer
168163

169164
std::string folderName = static_cast<std::string>(mFolderSuffix[mEventType]) + static_cast<std::string>(o2::aod::femtodreamMCparticle::MCTypeName[o2::aod::femtodreamMCparticle::MCType::kRecon]);
170165

171-
init_base<isHF>(folderName, femtoObs,
172-
femtoObsAxis, pTAxis, kTAxis, mTAxis, multAxis, multPercentileAxis,
173-
kstarAxis4D, mTAxis4D, multAxis4D, multPercentileAxis4D,
174-
use4dplots, extendedplots, mP2Axis);
166+
init_base(folderName, femtoObs,
167+
femtoObsAxis, pTAxis, kTAxis, mTAxis, multAxis, multPercentileAxis,
168+
kstarAxis4D, mTAxis4D, multAxis4D, multPercentileAxis4D,
169+
use4dplots, extendedplots, mP2Axis);
175170

176171
if (isMC) {
177172
folderName = static_cast<std::string>(mFolderSuffix[mEventType]) + static_cast<std::string>(o2::aod::femtodreamMCparticle::MCTypeName[o2::aod::femtodreamMCparticle::MCType::kTruth]);
178-
init_base<isHF>(folderName, femtoObs,
179-
femtoObsAxis, pTAxis, kTAxis, mTAxis, multAxis, multPercentileAxis,
180-
kstarAxis4D, mTAxis4D, multAxis4D, multPercentileAxis4D,
181-
use4dplots, extendedplots, mP2Axis);
173+
init_base(folderName, femtoObs,
174+
femtoObsAxis, pTAxis, kTAxis, mTAxis, multAxis, multPercentileAxis,
175+
kstarAxis4D, mTAxis4D, multAxis4D, multPercentileAxis4D,
176+
use4dplots, extendedplots, mP2Axis);
182177
init_MC(folderName, femtoObs, femtoObsAxis, multAxis, mTAxis, smearingByOrigin);
183178
}
184179
}
@@ -276,21 +271,10 @@ class FemtoDreamContainer
276271
/// \param part1 Particle one
277272
/// \param part2 Particle two
278273
/// \param mult Multiplicity of the event
279-
template <o2::aod::femtodreamMCparticle::MCType mc, bool isHF = false, typename T1, typename T2>
274+
template <o2::aod::femtodreamMCparticle::MCType mc, typename T1, typename T2>
280275
void setPair_base(const float femtoObs, const float mT, T1 const& part1, T2 const& part2, const int mult, const float multPercentile, bool use4dplots, bool extendedplots)
281276
{
282277
const float kT = FemtoDreamMath::getkT(part1, mMassOne, part2, mMassTwo);
283-
if constexpr (isHF) {
284-
float mP2 = 0.0;
285-
if (part2.candidateSelFlag() == o2::aod::fdhf::dplusToPiKPi) {
286-
mP2 = part2.m(std::array{o2::constants::physics::MassPiPlus, o2::constants::physics::MassKPlus, o2::constants::physics::MassPiPlus});
287-
} else if (part2.candidateSelFlag() == o2::aod::fdhf::lcToPKPi) {
288-
mP2 = part2.m(std::array{o2::constants::physics::MassProton, o2::constants::physics::MassKPlus, o2::constants::physics::MassPiPlus});
289-
} else if (part2.candidateSelFlag() == o2::aod::fdhf::lcToPiKP) {
290-
mP2 = part2.m(std::array{o2::constants::physics::MassPiPlus, o2::constants::physics::MassKPlus, o2::constants::physics::MassProton});
291-
}
292-
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/relPairkstarmP2"), femtoObs, mP2);
293-
}
294278
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/relPairDist"), femtoObs);
295279
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/relPairkT"), kT);
296280
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/relPairkstarkT"), femtoObs, kT);
@@ -361,7 +345,7 @@ class FemtoDreamContainer
361345
const float mT = FemtoDreamMath::getmT(part1, mMassOne, part2, mMassTwo);
362346

363347
if (mHistogramRegistry) {
364-
setPair_base<o2::aod::femtodreamMCparticle::MCType::kRecon, isHF>(femtoObs, mT, part1, part2, mult, multPercentile, use4dplots, extendedplots);
348+
setPair_base<o2::aod::femtodreamMCparticle::MCType::kRecon>(femtoObs, mT, part1, part2, mult, multPercentile, use4dplots, extendedplots);
365349

366350
if constexpr (isMC) {
367351
if constexpr (isHF) {
@@ -372,7 +356,7 @@ class FemtoDreamContainer
372356
const float mTMC = FemtoDreamMath::getmT(part1.fdMCParticle(), mMassOne, part2, mMassTwo);
373357

374358
if (std::abs(part1.fdMCParticle().pdgMCTruth()) == mPDGOne) { // Note: all pair-histogramms are filled with MC truth information ONLY in case of non-fake candidates
375-
setPair_base<o2::aod::femtodreamMCparticle::MCType::kTruth, isHF>(femtoObsMC, mTMC, part1.fdMCParticle(), part2, mult, multPercentile, use4dplots, extendedplots);
359+
setPair_base<o2::aod::femtodreamMCparticle::MCType::kTruth>(femtoObsMC, mTMC, part1.fdMCParticle(), part2, mult, multPercentile, use4dplots, extendedplots);
376360
setPair_MC(femtoObsMC, femtoObs, mT, mult, part1.fdMCParticle().partOriginMCTruth(), part2.flagMc(), smearingByOrigin);
377361
} else {
378362
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[o2::aod::femtodreamMCparticle::MCType::kTruth]) + HIST("/hFakePairsCounter"), 0);
@@ -386,7 +370,7 @@ class FemtoDreamContainer
386370
const float mTMC = FemtoDreamMath::getmT(part1.fdMCParticle(), mMassOne, part2.fdMCParticle(), mMassTwo);
387371

388372
if (std::abs(part1.fdMCParticle().pdgMCTruth()) == mPDGOne && std::abs(part2.fdMCParticle().pdgMCTruth()) == mPDGTwo) { // Note: all pair-histogramms are filled with MC truth information ONLY in case of non-fake candidates
389-
setPair_base<o2::aod::femtodreamMCparticle::MCType::kTruth, isHF>(femtoObsMC, mTMC, part1.fdMCParticle(), part2.fdMCParticle(), mult, multPercentile, use4dplots, extendedplots);
373+
setPair_base<o2::aod::femtodreamMCparticle::MCType::kTruth>(femtoObsMC, mTMC, part1.fdMCParticle(), part2.fdMCParticle(), mult, multPercentile, use4dplots, extendedplots);
390374
setPair_MC(femtoObsMC, femtoObs, mT, mult, part1.fdMCParticle().partOriginMCTruth(), part2.fdMCParticle().partOriginMCTruth(), smearingByOrigin);
391375
} else {
392376
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[o2::aod::femtodreamMCparticle::MCType::kTruth]) + HIST("/hFakePairsCounter"), 0);

PWGHF/TableProducer/derivedDataCreatorD0ToKPi.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ struct HfDerivedDataCreatorD0ToKPi {
334334
}
335335
}
336336
}
337+
337338
void processDataWithDCAFitterN(CollisionsWCentMult const& collisions,
338339
SelectedCandidates const&,
339340
aod::Tracks const& tracks,

PWGHF/TableProducer/derivedDataCreatorDplusToPiKPi.cxx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,7 @@ struct HfDerivedDataCreatorDplusToPiKPi {
301301
continue;
302302
}
303303
}
304-
} else {
305-
if (downSampleBkgFactor < 1.) {
306-
float const pseudoRndm = candidate.ptProng0() * 1000. - static_cast<int64_t>(candidate.ptProng0() * 1000);
307-
if (candidate.pt() < ptMaxForDownSample && pseudoRndm >= downSampleBkgFactor) {
308-
continue;
309-
}
310-
}
311-
}
312-
304+
}
313305
double const ct = HfHelper::ctDplus(candidate);
314306
double const y = HfHelper::yDplus(candidate);
315307
float const massDplusToPiKPi = HfHelper::invMassDplusToPiKPi(candidate);

0 commit comments

Comments
 (0)