Skip to content

Commit a58e5c0

Browse files
committed
Fix: minor clean up in pair hist manager
1 parent f27f598 commit a58e5c0

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

PWGCF/Femto/Core/pairHistManager.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ class PairHistManager
304304
{
305305
mPdgMass1 = o2::analysis::femto::utils::getMass(PdgParticle1);
306306
mPdgMass2 = o2::analysis::femto::utils::getMass(PdgParticle2);
307-
mAverageMass = (mPdgMass1 + mPdgMass2) / 2.f;
308-
mReducedMass = 2.f * (mPdgMass1 * mPdgMass2) / (mPdgMass1 + mPdgMass2);
309307
}
310308
void setCharge(int chargeAbsParticle1, int chargeAbsParticle2)
311309
{
@@ -596,23 +594,28 @@ class PairHistManager
596594

597595
float getKt(ROOT::Math::PtEtaPhiMVector const& part1, ROOT::Math::PtEtaPhiMVector const& part2)
598596
{
599-
double kt = 0.5 * (part1 + part2).Pt();
597+
auto sum = (part1 + part2);
598+
double kt = 0.5 * sum.Pt();
600599
return static_cast<float>(kt);
601600
}
602601

603602
float getMt(ROOT::Math::PtEtaPhiMVector const& part1, ROOT::Math::PtEtaPhiMVector const& part2)
604603
{
605604
auto sum = part1 + part2;
606605
double mt = 0;
606+
double averageMass = 0;
607+
double reducedMass = 0;
607608
switch (mMtType) {
608609
case modes::TransverseMassType::kAveragePdgMass:
609-
mt = std::hypot(0.5 * sum.Pt(), mAverageMass);
610+
averageMass = 0.5 * (part1.M() + part2.M());
611+
mt = std::hypot(0.5 * sum.Pt(), averageMass);
610612
break;
611613
case modes::TransverseMassType::kReducedPdgMass:
612-
mt = std::hypot(0.5 * sum.Pt(), mReducedMass);
614+
reducedMass = 2. * (part1.M() * part2.M()) / (part1.M() + part2.M());
615+
mt = std::hypot(0.5 * sum.Pt(), reducedMass);
613616
break;
614617
case modes::TransverseMassType::kMt4Vector:
615-
mt = sum.Mt() / 2.f;
618+
mt = 0.5 * sum.Mt();
616619
break;
617620
default:
618621
LOG(fatal) << "Invalid transverse mass type, breaking...";
@@ -634,12 +637,10 @@ class PairHistManager
634637
}
635638

636639
o2::framework::HistogramRegistry* mHistogramRegistry = nullptr;
637-
float mPdgMass1 = 0.f;
638-
float mPdgMass2 = 0.f;
640+
double mPdgMass1 = 0.f;
641+
double mPdgMass2 = 0.f;
639642

640643
modes::TransverseMassType mMtType = modes::TransverseMassType::kAveragePdgMass;
641-
double mAverageMass = 0.f;
642-
double mReducedMass = 0.f;
643644

644645
int mAbsCharge1 = 1;
645646
int mAbsCharge2 = 1;

0 commit comments

Comments
 (0)