Skip to content

Commit 6d5aba8

Browse files
vkuceravkucera
committed
Remove HfHelper instances
1 parent 5fa37b5 commit 6d5aba8

2 files changed

Lines changed: 48 additions & 48 deletions

File tree

‎PWGDQ/Core/VarManager.h‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
#include "PWGUD/Core/UDHelpers.h"
2525
#include "PWGUD/Core/UPCHelpers.h"
26+
//
27+
#include "PWGHF/Core/HfHelper.h"
2628

2729
#include "Common/CCDB/EventSelectionParams.h"
2830
#include "Common/CCDB/TriggerAliases.h"
@@ -1562,10 +1564,10 @@ class VarManager : public TObject
15621564
static void FillDileptonPhoton(T1 const& dilepton, T2 const& photon, float* values = nullptr);
15631565
template <typename T>
15641566
static void FillHadron(T const& hadron, float* values = nullptr, float hadronMass = 0.0f);
1565-
template <int partType, typename Cand, typename H, typename T>
1566-
static void FillSingleDileptonCharmHadron(Cand const& candidate, H hfHelper, T& bdtScoreCharmHad, float* values = nullptr);
1567-
template <int partTypeCharmHad, typename DQ, typename HF, typename H, typename T>
1568-
static void FillDileptonCharmHadron(DQ const& dilepton, HF const& charmHadron, H hfHelper, T& bdtScoreCharmHad, float* values = nullptr);
1567+
template <int partType, typename Cand, typename T>
1568+
static void FillSingleDileptonCharmHadron(Cand const& candidate, T& bdtScoreCharmHad, float* values = nullptr);
1569+
template <int partTypeCharmHad, typename DQ, typename HF, typename T>
1570+
static void FillDileptonCharmHadron(DQ const& dilepton, HF const& charmHadron, T& bdtScoreCharmHad, float* values = nullptr);
15691571
template <typename C, typename A>
15701572
static void FillQVectorFromGFW(C const& collision, A const& compA11, A const& compB11, A const& compC11, A const& compA21, A const& compB21, A const& compC21, A const& compA31, A const& compB31, A const& compC31, A const& compA41, A const& compB41, A const& compC41, A const& compA23, A const& compA42, float S10A = 1.0, float S10B = 1.0, float S10C = 1.0, float S11A = 1.0, float S11B = 1.0, float S11C = 1.0, float S12A = 1.0, float S13A = 1.0, float S14A = 1.0, float S21A = 1.0, float S22A = 1.0, float S31A = 1.0, float S41A = 1.0, float* values = nullptr);
15711573
template <typename C>
@@ -3899,12 +3901,12 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values)
38993901
}
39003902

39013903
// polarization parameters
3902-
bool useHE = fgUsedVars[kCosThetaHE] || fgUsedVars[kPhiHE]; // helicity frame
3903-
bool useCS = fgUsedVars[kCosThetaCS] || fgUsedVars[kPhiCS]; // Collins-Soper frame
3904+
bool useHE = fgUsedVars[kCosThetaHE] || fgUsedVars[kPhiHE]; // helicity frame
3905+
bool useCS = fgUsedVars[kCosThetaCS] || fgUsedVars[kPhiCS]; // Collins-Soper frame
39043906
bool useGJB1 = fgUsedVars[kCosThetaGJB1] || fgUsedVars[kPhiGJB1]; // Gottfried-Jackson frame, beam 1 (+z)
39053907
bool useGJB2 = fgUsedVars[kCosThetaGJB2] || fgUsedVars[kPhiGJB2]; // Gottfried-Jackson frame, beam 2 (-z)
3906-
bool usePP = fgUsedVars[kCosThetaPP]; // production plane frame
3907-
bool useRM = fgUsedVars[kCosThetaRM]; // Random frame
3908+
bool usePP = fgUsedVars[kCosThetaPP]; // production plane frame
3909+
bool useRM = fgUsedVars[kCosThetaRM]; // Random frame
39083910

39093911
if (useHE || useCS || useGJB1 || useGJB2 || usePP || useRM) {
39103912
ROOT::Math::Boost boostv12{v12.BoostToCM()};
@@ -4460,12 +4462,12 @@ void VarManager::FillPairME(T1 const& t1, T2 const& t2, float* values)
44604462
}
44614463

44624464
// polarization parameters
4463-
bool useHE = fgUsedVars[kCosThetaHE] || fgUsedVars[kPhiHE]; // helicity frame
4464-
bool useCS = fgUsedVars[kCosThetaCS] || fgUsedVars[kPhiCS]; // Collins-Soper frame
4465+
bool useHE = fgUsedVars[kCosThetaHE] || fgUsedVars[kPhiHE]; // helicity frame
4466+
bool useCS = fgUsedVars[kCosThetaCS] || fgUsedVars[kPhiCS]; // Collins-Soper frame
44654467
bool useGJB1 = fgUsedVars[kCosThetaGJB1] || fgUsedVars[kPhiGJB1]; // Gottfried-Jackson frame, beam 1 (+z)
44664468
bool useGJB2 = fgUsedVars[kCosThetaGJB2] || fgUsedVars[kPhiGJB2]; // Gottfried-Jackson frame, beam 2 (-z)
4467-
bool usePP = fgUsedVars[kCosThetaPP]; // production plane frame
4468-
bool useRM = fgUsedVars[kCosThetaRM]; // Random frame
4469+
bool usePP = fgUsedVars[kCosThetaPP]; // production plane frame
4470+
bool useRM = fgUsedVars[kCosThetaRM]; // Random frame
44694471

44704472
if (useHE || useCS || useGJB1 || useGJB2 || usePP || useRM) {
44714473
ROOT::Math::Boost boostv12{v12.BoostToCM()};
@@ -4888,12 +4890,12 @@ void VarManager::FillPairMC(T1 const& t1, T2 const& t2, float* values)
48884890
values[kMCP2] = t2.p();
48894891

48904892
// polarization parameters
4891-
bool useHE = fgUsedVars[kMCCosThetaHE] || fgUsedVars[kMCPhiHE]; // helicity frame
4892-
bool useCS = fgUsedVars[kMCCosThetaCS] || fgUsedVars[kMCPhiCS]; // Collins-Soper frame
4893+
bool useHE = fgUsedVars[kMCCosThetaHE] || fgUsedVars[kMCPhiHE]; // helicity frame
4894+
bool useCS = fgUsedVars[kMCCosThetaCS] || fgUsedVars[kMCPhiCS]; // Collins-Soper frame
48934895
bool useGJB1 = fgUsedVars[kMCCosThetaGJB1] || fgUsedVars[kMCPhiGJB1]; // Gottfried-Jackson frame, beam 1 (+z)
48944896
bool useGJB2 = fgUsedVars[kMCCosThetaGJB2] || fgUsedVars[kMCPhiGJB2]; // Gottfried-Jackson frame, beam 2 (-z)
4895-
bool usePP = fgUsedVars[kMCCosThetaPP]; // production plane frame
4896-
bool useRM = fgUsedVars[kMCCosThetaRM]; // Random frame
4897+
bool usePP = fgUsedVars[kMCCosThetaPP]; // production plane frame
4898+
bool useRM = fgUsedVars[kMCCosThetaRM]; // Random frame
48974899

48984900
if (useHE || useCS || useGJB1 || useGJB2 || usePP || useRM) {
48994901
ROOT::Math::Boost boostv12{v12.BoostToCM()};
@@ -6829,8 +6831,8 @@ void VarManager::FillHadron(T const& hadron, float* values, float hadronMass)
68296831
values[kRap] = vhadron.Rapidity();
68306832
}
68316833

6832-
template <int partType, typename Cand, typename H, typename T>
6833-
void VarManager::FillSingleDileptonCharmHadron(Cand const& candidate, H hfHelper, T& bdtScoreCharmHad, float* values)
6834+
template <int partType, typename Cand, typename T>
6835+
void VarManager::FillSingleDileptonCharmHadron(Cand const& candidate, T& bdtScoreCharmHad, float* values)
68346836
{
68356837
if (!values) {
68366838
values = static_cast<float*>(fgValues);
@@ -6843,33 +6845,33 @@ void VarManager::FillSingleDileptonCharmHadron(Cand const& candidate, H hfHelper
68436845
values[kRap] = candidate.rap();
68446846
}
68456847
if constexpr (partType == kD0ToPiK) {
6846-
values[kMassCharmHadron] = hfHelper.invMassD0ToPiK(candidate);
6848+
values[kMassCharmHadron] = HfHelper::invMassD0ToPiK(candidate);
68476849
values[kPtCharmHadron] = candidate.pt();
68486850
values[kPhiCharmHadron] = candidate.phi();
6849-
values[kRapCharmHadron] = hfHelper.yD0(candidate);
6851+
values[kRapCharmHadron] = HfHelper::yD0(candidate);
68506852
values[kBdtCharmHadron] = static_cast<float>(bdtScoreCharmHad);
68516853
}
68526854
if constexpr (partType == kD0barToKPi) {
6853-
values[kMassCharmHadron] = hfHelper.invMassD0barToKPi(candidate);
6855+
values[kMassCharmHadron] = HfHelper::invMassD0barToKPi(candidate);
68546856
values[kPtCharmHadron] = candidate.pt();
68556857
values[kPhiCharmHadron] = candidate.phi();
6856-
values[kRapCharmHadron] = hfHelper.yD0(candidate);
6858+
values[kRapCharmHadron] = HfHelper::yD0(candidate);
68576859
values[kBdtCharmHadron] = static_cast<float>(bdtScoreCharmHad);
68586860
}
68596861
if constexpr (partType == kDplusToPiKPi) {
6860-
values[kMassCharmHadron] = hfHelper.invMassDplusToPiKPi(candidate);
6862+
values[kMassCharmHadron] = HfHelper::invMassDplusToPiKPi(candidate);
68616863
values[kPtCharmHadron] = candidate.pt();
68626864
values[kPhiCharmHadron] = candidate.phi();
6863-
values[kRapCharmHadron] = hfHelper.yDplus(candidate);
6865+
values[kRapCharmHadron] = HfHelper::yDplus(candidate);
68646866
values[kBdtCharmHadron] = static_cast<float>(bdtScoreCharmHad);
68656867
}
68666868
}
68676869

6868-
template <int partTypeCharmHad, typename DQ, typename HF, typename H, typename T>
6869-
void VarManager::FillDileptonCharmHadron(DQ const& dilepton, HF const& charmHadron, H hfHelper, T& bdtScoreCharmHad, float* values)
6870+
template <int partTypeCharmHad, typename DQ, typename HF, typename T>
6871+
void VarManager::FillDileptonCharmHadron(DQ const& dilepton, HF const& charmHadron, T& bdtScoreCharmHad, float* values)
68706872
{
6871-
FillSingleDileptonCharmHadron<kJPsi>(dilepton, hfHelper, bdtScoreCharmHad, values);
6872-
FillSingleDileptonCharmHadron<partTypeCharmHad>(charmHadron, hfHelper, bdtScoreCharmHad, values);
6873+
FillSingleDileptonCharmHadron<kJPsi>(dilepton, bdtScoreCharmHad, values);
6874+
FillSingleDileptonCharmHadron<partTypeCharmHad>(charmHadron, bdtScoreCharmHad, values);
68736875
}
68746876

68756877
template <int candidateType, typename T1, typename T2, typename T3>
@@ -7767,12 +7769,12 @@ void VarManager::FillPairAlice3(T1 const& t1, T2 const& t2, float* values)
77677769
}
77687770

77697771
// polarization parameters
7770-
bool useHE = fgUsedVars[kCosThetaHE] || fgUsedVars[kPhiHE]; // helicity frame
7771-
bool useCS = fgUsedVars[kCosThetaCS] || fgUsedVars[kPhiCS]; // Collins-Soper frame
7772+
bool useHE = fgUsedVars[kCosThetaHE] || fgUsedVars[kPhiHE]; // helicity frame
7773+
bool useCS = fgUsedVars[kCosThetaCS] || fgUsedVars[kPhiCS]; // Collins-Soper frame
77727774
bool useGJB1 = fgUsedVars[kCosThetaGJB1] || fgUsedVars[kPhiGJB1]; // Gottfried-Jackson frame, beam 1 (+z)
77737775
bool useGJB2 = fgUsedVars[kCosThetaGJB2] || fgUsedVars[kPhiGJB2]; // Gottfried-Jackson frame, beam 2 (-z)
7774-
bool usePP = fgUsedVars[kCosThetaPP]; // production plane frame
7775-
bool useRM = fgUsedVars[kCosThetaRM]; // Random frame
7776+
bool usePP = fgUsedVars[kCosThetaPP]; // production plane frame
7777+
bool useRM = fgUsedVars[kCosThetaRM]; // Random frame
77767778

77777779
if (useHE || useCS || useGJB1 || useGJB2 || usePP || useRM) {
77787780
ROOT::Math::Boost boostv12{v12.BoostToCM()};

‎PWGDQ/TableProducer/tableMakerJpsiHf.cxx‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ using TracksWithExtra = soa::Join<aod::Tracks, aod::TracksExtra>;
102102
using MyBarrelTracksSelectedWithColl = soa::Join<aod::ReducedTracks, aod::ReducedTracksBarrel, aod::ReducedTracksBarrelPID, aod::ReducedTracksBarrelInfo>;
103103
using MyMuonTracksSelectedWithColl = soa::Join<aod::ReducedMuons, aod::ReducedMuonsExtra, aod::ReducedMuonsInfo>;
104104

105-
HfHelper hfHelper;
106-
107105
struct tableMakerJpsiHf {
108106
//
109107
// This task combines dilepton candidates with a open charm hadron
@@ -321,9 +319,9 @@ struct tableMakerJpsiHf {
321319

322320
double rapDmeson = -999.;
323321
if constexpr (TDmeson == DmesonType::D0) {
324-
rapDmeson = hfHelper.yD0(dmeson);
322+
rapDmeson = HfHelper::yD0(dmeson);
325323
} else if constexpr (TDmeson == DmesonType::Dplus) {
326-
rapDmeson = hfHelper.yDplus(dmeson);
324+
rapDmeson = HfHelper::yDplus(dmeson);
327325
}
328326

329327
if (yCandDmesonMax >= 0. && std::abs(rapDmeson) > yCandDmesonMax) {
@@ -332,18 +330,18 @@ struct tableMakerJpsiHf {
332330

333331
if constexpr (TDmeson == DmesonType::D0) {
334332
if (dmeson.isSelD0() >= 1) {
335-
VarManager::FillSingleDileptonCharmHadron<VarManager::kD0ToPiK>(dmeson, hfHelper, scores[0], fValuesDileptonCharmHadron);
333+
VarManager::FillSingleDileptonCharmHadron<VarManager::kD0ToPiK>(dmeson, scores[0], fValuesDileptonCharmHadron);
336334
fHistMan->FillHistClass("Dmeson", fValuesDileptonCharmHadron);
337335
VarManager::ResetValues(0, VarManager::kNVars, fValuesDileptonCharmHadron);
338336
}
339337
if (dmeson.isSelD0bar() >= 1) {
340-
VarManager::FillSingleDileptonCharmHadron<VarManager::kD0barToKPi>(dmeson, hfHelper, scores[3], fValuesDileptonCharmHadron);
338+
VarManager::FillSingleDileptonCharmHadron<VarManager::kD0barToKPi>(dmeson, scores[3], fValuesDileptonCharmHadron);
341339
fHistMan->FillHistClass("Dmeson", fValuesDileptonCharmHadron);
342340
VarManager::ResetValues(0, VarManager::kNVars, fValuesDileptonCharmHadron);
343341
}
344342
} else if constexpr (TDmeson == DmesonType::Dplus) {
345343
if (dmeson.isSelDplusToPiKPi() >= 1) {
346-
VarManager::FillSingleDileptonCharmHadron<VarManager::kDplusToPiKPi>(dmeson, hfHelper, scores_dplus[0], fValuesDileptonCharmHadron);
344+
VarManager::FillSingleDileptonCharmHadron<VarManager::kDplusToPiKPi>(dmeson, scores_dplus[0], fValuesDileptonCharmHadron);
347345
fHistMan->FillHistClass("Dmeson", fValuesDileptonCharmHadron);
348346
VarManager::ResetValues(0, VarManager::kNVars, fValuesDileptonCharmHadron);
349347
}
@@ -366,7 +364,7 @@ struct tableMakerJpsiHf {
366364

367365
if (configDebug) {
368366
float dummyScore{-999.f};
369-
VarManager::FillSingleDileptonCharmHadron<VarManager::kJPsi>(dilepton, hfHelper, dummyScore, fValuesDileptonCharmHadron);
367+
VarManager::FillSingleDileptonCharmHadron<VarManager::kJPsi>(dilepton, dummyScore, fValuesDileptonCharmHadron);
370368
fHistMan->FillHistClass("JPsi", fValuesDileptonCharmHadron);
371369
VarManager::ResetValues(0, VarManager::kNVars, fValuesDileptonCharmHadron);
372370
}
@@ -391,9 +389,9 @@ struct tableMakerJpsiHf {
391389

392390
double rapDmeson = -999.;
393391
if constexpr (TDmeson == DmesonType::D0) {
394-
rapDmeson = hfHelper.yD0(dmeson);
392+
rapDmeson = HfHelper::yD0(dmeson);
395393
} else if constexpr (TDmeson == DmesonType::Dplus) {
396-
rapDmeson = hfHelper.yDplus(dmeson);
394+
rapDmeson = HfHelper::yDplus(dmeson);
397395
}
398396

399397
if (yCandDmesonMax >= 0. && std::abs(rapDmeson) > yCandDmesonMax) {
@@ -471,14 +469,14 @@ struct tableMakerJpsiHf {
471469

472470
if constexpr (TDmeson == DmesonType::D0) {
473471
if (dmeson.isSelD0() >= 1) {
474-
massD0 = hfHelper.invMassD0ToPiK(dmeson);
475-
VarManager::FillDileptonCharmHadron<VarManager::kD0ToPiK>(dilepton, dmeson, hfHelper, scores[0], fValuesDileptonCharmHadron);
472+
massD0 = HfHelper::invMassD0ToPiK(dmeson);
473+
VarManager::FillDileptonCharmHadron<VarManager::kD0ToPiK>(dilepton, dmeson, scores[0], fValuesDileptonCharmHadron);
476474
fHistMan->FillHistClass("JPsiDmeson", fValuesDileptonCharmHadron);
477475
VarManager::ResetValues(0, VarManager::kNVars, fValuesDileptonCharmHadron);
478476
}
479477
if (dmeson.isSelD0bar() >= 1) {
480-
massD0bar = hfHelper.invMassD0barToKPi(dmeson);
481-
VarManager::FillDileptonCharmHadron<VarManager::kD0barToKPi>(dilepton, dmeson, hfHelper, scores[3], fValuesDileptonCharmHadron);
478+
massD0bar = HfHelper::invMassD0barToKPi(dmeson);
479+
VarManager::FillDileptonCharmHadron<VarManager::kD0barToKPi>(dilepton, dmeson, scores[3], fValuesDileptonCharmHadron);
482480
fHistMan->FillHistClass("JPsiDmeson", fValuesDileptonCharmHadron);
483481
VarManager::ResetValues(0, VarManager::kNVars, fValuesDileptonCharmHadron);
484482
}
@@ -487,8 +485,8 @@ struct tableMakerJpsiHf {
487485
}
488486
} else if constexpr (TDmeson == DmesonType::Dplus) {
489487
if (dmeson.isSelDplusToPiKPi() >= 1) {
490-
massDplus = hfHelper.invMassDplusToPiKPi(dmeson);
491-
VarManager::FillDileptonCharmHadron<VarManager::kDplusToPiKPi>(dilepton, dmeson, hfHelper, scores_dplus[0], fValuesDileptonCharmHadron);
488+
massDplus = HfHelper::invMassDplusToPiKPi(dmeson);
489+
VarManager::FillDileptonCharmHadron<VarManager::kDplusToPiKPi>(dilepton, dmeson, scores_dplus[0], fValuesDileptonCharmHadron);
492490
fHistMan->FillHistClass("JPsiDmeson", fValuesDileptonCharmHadron);
493491
VarManager::ResetValues(0, VarManager::kNVars, fValuesDileptonCharmHadron);
494492
}

0 commit comments

Comments
 (0)