Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PWGCF/FemtoDream/Core/femtoDreamContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <string>
#include <vector>

using namespace o2::framework;

Check failure on line 36 in PWGCF/FemtoDream/Core/femtoDreamContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive]

Do not put using directives at global scope in headers.

namespace o2::analysis::femtoDream
{
Expand Down Expand Up @@ -270,7 +270,7 @@
}
if (extendedplots) {
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/relPairkstarmTPtPart1PtPart2MultPercentile"), femtoObs, mT, part1.pt(), part2.pt(), multPercentile);
if constexpr (std::is_same_v<T1, o2::aod::FDParticle> && std::is_same_v<T2, o2::aod::FDParticle>) {
if constexpr (requires { part1.mLambda(); part2.mLambda(); }) {
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/invMassPart1invMassPart2kstar"), part1.mLambda(), part2.mLambda(), femtoObs);
}
}
Expand Down Expand Up @@ -332,7 +332,7 @@
}
const float mTMC = FemtoDreamMath::getmT(part1.fdMCParticle(), mMassOne, part2, mMassTwo);

if (abs(part1.fdMCParticle().pdgMCTruth()) == mPDGOne) { // Note: all pair-histogramms are filled with MC truth information ONLY in case of non-fake candidates

Check failure on line 335 in PWGCF/FemtoDream/Core/femtoDreamContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
setPair_base<o2::aod::femtodreamMCparticle::MCType::kTruth, isHF>(femtoObsMC, mTMC, part1.fdMCParticle(), part2, mult, multPercentile, use4dplots, extendedplots);
setPair_MC(femtoObsMC, femtoObs, mT, mult, part1.fdMCParticle().partOriginMCTruth(), part2.flagMc(), smearingByOrigin);
} else {
Expand All @@ -346,7 +346,7 @@
}
const float mTMC = FemtoDreamMath::getmT(part1.fdMCParticle(), mMassOne, part2.fdMCParticle(), mMassTwo);

if (abs(part1.fdMCParticle().pdgMCTruth()) == mPDGOne && abs(part2.fdMCParticle().pdgMCTruth()) == mPDGTwo) { // Note: all pair-histogramms are filled with MC truth information ONLY in case of non-fake candidates

Check failure on line 349 in PWGCF/FemtoDream/Core/femtoDreamContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
setPair_base<o2::aod::femtodreamMCparticle::MCType::kTruth, isHF>(femtoObsMC, mTMC, part1.fdMCParticle(), part2.fdMCParticle(), mult, multPercentile, use4dplots, extendedplots);
setPair_MC(femtoObsMC, femtoObs, mT, mult, part1.fdMCParticle().partOriginMCTruth(), part2.fdMCParticle().partOriginMCTruth(), smearingByOrigin);
} else {
Expand Down Expand Up @@ -397,7 +397,7 @@
}
const float mTMC = FemtoDreamMath::getmT(part1.fdMCParticle(), mMassOne, part2.fdMCParticle(), mMassTwo);

if (abs(part1.fdMCParticle().pdgMCTruth()) == mPDGOne && abs(part2.fdMCParticle().pdgMCTruth()) == mPDGTwo) { // Note: all pair-histogramms are filled with MC truth information ONLY in case of non-fake candidates

Check failure on line 400 in PWGCF/FemtoDream/Core/femtoDreamContainer.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
setPair_qn_base<o2::aod::femtodreamMCparticle::MCType::kTruth>(femtoObsMC, mTMC, multPercentile, myQnBin, numQnBins);
} else {
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[o2::aod::femtodreamMCparticle::MCType::kTruth]) + HIST("/hFakePairsCounter"), 0);
Expand Down
14 changes: 5 additions & 9 deletions PWGCF/FemtoDream/Core/femtoDreamResoSelection.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class FemtoDreamResoSelection
virtual ~FemtoDreamResoSelection() = default;

template <typename V>
uint32_t getType(V const& track1, V const& track2, bool resoIsNotAnti);
int getType(V const& track1, V const& track2, bool resoIsNotAnti);

/// assigns value from configurbale to private class member
template <typename V>
Expand Down Expand Up @@ -218,7 +218,7 @@ class FemtoDreamResoSelection
}; // namespace femtoDream

template <typename V>
uint32_t FemtoDreamResoSelection::getType(V const& track1, V const& track2, bool resoIsNotAnti)
int FemtoDreamResoSelection::getType(V const& track1, V const& track2, bool resoIsNotAnti)
{
float posThresh = 0.;
float negThresh = 0.;
Expand Down Expand Up @@ -403,13 +403,9 @@ float FemtoDreamResoSelection::getNSigTotal(T const& track, V const& pid, float
return std::abs(nSigTPC);
}

float nSigTOF = 0.;
if (!track.hasTOF()) {
nSigTOF = 999.f;
} else {
nSigTOF = o2::aod::pidutils::tofNSigma(pid, track);
}
return std::sqrt(nSigTPC * nSigTPC + nSigTOF * nSigTOF);
float nSigTOF = track.hasTOF() ? o2::aod::pidutils::tofNSigma(pid, track) : 999.f;

return std::hypot(nSigTPC, nSigTOF);
}

//// new getCutContainer
Expand Down
Loading