@@ -486,11 +486,10 @@ class VarManager : public TObject
486486 kV2ME_EP ,
487487 kWV2ME_SP ,
488488 kWV2ME_EP ,
489- kTwoR2SP1 , // Scalar product resolution of event1 for ME technique
490- kTwoR2SP2 , // Scalar product resolution of event2 for ME technique
491- kTwoR2EP1 , // Event plane resolution of event2 for ME technique
492- kTwoR2EP2 , // Event plane resolution of event2 for ME technique
493- kNPairsPerEvent , // number of pairs per event in same-event or mixed-event pairing
489+ kTwoR2SP1 , // Scalar product resolution of event1 for ME technique
490+ kTwoR2SP2 , // Scalar product resolution of event2 for ME technique
491+ kTwoR2EP1 , // Event plane resolution of event2 for ME technique
492+ kTwoR2EP2 , // Event plane resolution of event2 for ME technique
494493
495494 // Variables for event mixing with cumulant
496495 kV22m ,
@@ -1371,7 +1370,7 @@ class VarManager : public TObject
13711370 template <typename T1, typename T2, typename T3>
13721371 static void FillEnergyCorrelatorTriple (T1 const & lepton1, T2 const & lepton2, T3 const & hadron, float * values = nullptr , float Translow = 1 . / 3 , float Transhigh = 2 . / 3 , bool applyFitMass = false , float sidebandMass = 0 .0f );
13731372 template <int pairType, typename T1, typename T2, typename T3, typename T4, typename T5>
1374- static void FillEnergyCorrelatorsUnfoldingTriple (T1 const & lepton1, T2 const & lepton2, T3 const & hadron, T4 const & track, T5 const & t1, float * values = nullptr , bool applyFitMass = false );
1373+ static void FillEnergyCorrelatorsUnfoldingTriple (T1 const & lepton1, T2 const & lepton2, T3 const & hadron, T4 const & track, T5 const & t1, float * values = nullptr );
13751374 template <typename T1, typename T2>
13761375 static void FillDileptonPhoton (T1 const & dilepton, T2 const & photon, float * values = nullptr );
13771376 template <typename T>
@@ -5868,7 +5867,7 @@ void VarManager::FillEnergyCorrelatorTriple(T1 const& lepton1, T2 const& lepton2
58685867}
58695868
58705869template <int pairType, typename T1, typename T2, typename T3, typename T4, typename T5>
5871- void VarManager::FillEnergyCorrelatorsUnfoldingTriple (T1 const & lepton1, T2 const & lepton2, T3 const & hadron, T4 const & track, T5 const & t1, float * values, bool applyFitMass )
5870+ void VarManager::FillEnergyCorrelatorsUnfoldingTriple (T1 const & lepton1, T2 const & lepton2, T3 const & hadron, T4 const & track, T5 const & t1, float * values)
58725871{
58735872 if (fgUsedVars[kMCCosChi_gen ] || fgUsedVars[kMCWeight_gen ] || fgUsedVars[kMCdeltaeta_gen ] || fgUsedVars[kMCCosChi_rec ] || fgUsedVars[kMCWeight_rec ] || fgUsedVars[kMCdeltaeta_rec ]) {
58745873 // energy correlators
@@ -5880,11 +5879,6 @@ void VarManager::FillEnergyCorrelatorsUnfoldingTriple(T1 const& lepton1, T2 cons
58805879 ROOT::Math::PtEtaPhiMVector v_lepton2 (lepton2.pt (), lepton2.eta (), lepton2.phi (), m2);
58815880 ROOT::Math::PtEtaPhiMVector dilepton = v_lepton1 + v_lepton2;
58825881
5883- float dileptonmass = o2::constants::physics::MassJPsi;
5884- if (applyFitMass) {
5885- dileptonmass = dilepton.mass ();
5886- }
5887-
58885882 float MassHadron;
58895883 if constexpr (pairType == kJpsiHadronMass ) {
58905884 MassHadron = TMath::Sqrt (t1.e () * t1.e () - t1.p () * t1.p ());
@@ -5900,7 +5894,7 @@ void VarManager::FillEnergyCorrelatorsUnfoldingTriple(T1 const& lepton1, T2 cons
59005894 values[kMCWeight_gen ] = E_boost_gen / o2::constants::physics::MassJPsi;
59015895 values[kMCdeltaeta_gen ] = track.eta () - t1.eta ();
59025896
5903- ROOT::Math::PtEtaPhiMVector v1_rec (dilepton.pt (), dilepton.eta (), dilepton.phi (), dileptonmass );
5897+ ROOT::Math::PtEtaPhiMVector v1_rec (dilepton.pt (), dilepton.eta (), dilepton.phi (), dilepton. mass () );
59045898 ROOT::Math::PtEtaPhiMVector v2_rec (hadron.pt (), hadron.eta (), hadron.phi (), o2::constants::physics::MassPionCharged);
59055899 values[kMCCosChi_rec ] = LorentzTransformJpsihadroncosChi (" coschi" , v1_rec, v2_rec);
59065900 float E_boost_rec = LorentzTransformJpsihadroncosChi (" weight_boost" , v1_rec, v2_rec);
0 commit comments