@@ -126,8 +126,8 @@ struct ConfPairBinning : o2::framework::ConfigurableGroup {
126126 o2::framework::ConfigurableAxis centrality{" centrality" , {{10 , 0 , 100 }}, " centrality (mult. percentile)" };
127127 o2::framework::ConfigurableAxis pt1{" pt1" , {{100 , 0 , 6 }}, " Pt binning for particle 1" };
128128 o2::framework::ConfigurableAxis pt2{" pt2" , {{100 , 0 , 6 }}, " Pt binning for particle 2" };
129- o2::framework::ConfigurableAxis mass1{" mass1" , {{100 , 0 , 2 }}, " Mass binning for particle 1 (if particle has mass getter)" };
130- o2::framework::ConfigurableAxis mass2{" mass2" , {{100 , 0 , 2 }}, " Mass binning for particle 2 (if particle has mass getter)" };
129+ o2::framework::ConfigurableAxis mass1{" mass1" , {{100 , 0 , 2 }}, " Mass binning for particle 1 (if particle has mass getter, otherwise PDG mass )" };
130+ o2::framework::ConfigurableAxis mass2{" mass2" , {{100 , 0 , 2 }}, " Mass binning for particle 2 (if particle has mass getter, otherwise PDG mass )" };
131131 o2::framework::Configurable<int > transverseMassType{" transverseMassType" , static_cast <int >(modes::TransverseMassType::kAveragePdgMass ), " Type of transverse mass (0-> Average Pdg Mass, 1-> Reduced Pdg Mass, 2-> Mt from combined 4 vector)" };
132132};
133133
@@ -353,11 +353,11 @@ class PairHistManager
353353 // if one of the particles has a mass getter (like lambda), we cache the value for the filling later
354354 // otherwise we continue to use the pdg mass
355355 mMass1 = mPdgMass1 ;
356- if constexpr (modes::hasMass (particleType1) ) {
356+ if constexpr (utils::HasMass<T1> ) {
357357 mMass1 = particle1.mass ();
358358 }
359359 mMass2 = mPdgMass2 ;
360- if constexpr (modes::hasMass (particleType2) ) {
360+ if constexpr (utils::HasMass<T2> ) {
361361 mMass2 = particle2.mass ();
362362 }
363363 }
@@ -478,17 +478,9 @@ class PairHistManager
478478 mHistogramRegistry ->add (analysisDir + getHistNameV2 (kKstarVsMt , HistTable), getHistDesc (kKstarVsMt , HistTable), getHistType (kKstarVsMt , HistTable), {Specs.at (kKstarVsMt )});
479479 mHistogramRegistry ->add (analysisDir + getHistNameV2 (kKstarVsMult , HistTable), getHistDesc (kKstarVsMult , HistTable), getHistType (kKstarVsMult , HistTable), {Specs.at (kKstarVsMult )});
480480 mHistogramRegistry ->add (analysisDir + getHistNameV2 (kKstarVsCent , HistTable), getHistDesc (kKstarVsCent , HistTable), getHistType (kKstarVsCent , HistTable), {Specs.at (kKstarVsCent )});
481-
482- // special care for mass plots since not all particles have "mass"
483- if constexpr (modes::hasMass (particleType1)) {
484- mHistogramRegistry ->add (analysisDir + getHistNameV2 (kKstarVsMass1 , HistTable), getHistDesc (kKstarVsMass1 , HistTable), getHistType (kKstarVsMass1 , HistTable), {Specs.at (kKstarVsMass1 )});
485- }
486- if constexpr (modes::hasMass (particleType2)) {
487- mHistogramRegistry ->add (analysisDir + getHistNameV2 (kKstarVsMass2 , HistTable), getHistDesc (kKstarVsMass2 , HistTable), getHistType (kKstarVsMass2 , HistTable), {Specs.at (kKstarVsMass2 )});
488- }
489- if constexpr (modes::hasMass (particleType1) && modes::hasMass (particleType2)) {
490- mHistogramRegistry ->add (analysisDir + getHistNameV2 (kMass1VsMass2 , HistTable), getHistDesc (kMass1VsMass2 , HistTable), getHistType (kMass1VsMass2 , HistTable), {Specs.at (kMass1VsMass2 )});
491- }
481+ mHistogramRegistry ->add (analysisDir + getHistNameV2 (kKstarVsMass1 , HistTable), getHistDesc (kKstarVsMass1 , HistTable), getHistType (kKstarVsMass1 , HistTable), {Specs.at (kKstarVsMass1 )});
482+ mHistogramRegistry ->add (analysisDir + getHistNameV2 (kKstarVsMass2 , HistTable), getHistDesc (kKstarVsMass2 , HistTable), getHistType (kKstarVsMass2 , HistTable), {Specs.at (kKstarVsMass2 )});
483+ mHistogramRegistry ->add (analysisDir + getHistNameV2 (kMass1VsMass2 , HistTable), getHistDesc (kMass1VsMass2 , HistTable), getHistType (kMass1VsMass2 , HistTable), {Specs.at (kMass1VsMass2 )});
492484 }
493485
494486 // higher dimensional histograms
@@ -559,16 +551,9 @@ class PairHistManager
559551 mHistogramRegistry ->fill (HIST (prefix) + HIST (AnalysisDir) + HIST (getHistName (kKstarVsMult , HistTable)), mKstar , mMult );
560552 mHistogramRegistry ->fill (HIST (prefix) + HIST (AnalysisDir) + HIST (getHistName (kKstarVsCent , HistTable)), mKstar , mCent );
561553
562- // // special care for mass plots since not all particles have "mass"
563- if constexpr (modes::hasMass (particleType1)) {
564- mHistogramRegistry ->fill (HIST (prefix) + HIST (AnalysisDir) + HIST (getHistName (kKstarVsMass1 , HistTable)), mKstar , mMass1 );
565- }
566- if constexpr (modes::hasMass (particleType2)) {
567- mHistogramRegistry ->fill (HIST (prefix) + HIST (AnalysisDir) + HIST (getHistName (kKstarVsMass2 , HistTable)), mKstar , mMass2 );
568- }
569- if constexpr (modes::hasMass (particleType1) && modes::hasMass (particleType2)) {
570- mHistogramRegistry ->fill (HIST (prefix) + HIST (AnalysisDir) + HIST (getHistName (kMass1VsMass2 , HistTable)), mMass1 , mMass2 );
571- }
554+ mHistogramRegistry ->fill (HIST (prefix) + HIST (AnalysisDir) + HIST (getHistName (kKstarVsMass1 , HistTable)), mKstar , mMass1 );
555+ mHistogramRegistry ->fill (HIST (prefix) + HIST (AnalysisDir) + HIST (getHistName (kKstarVsMass2 , HistTable)), mKstar , mMass2 );
556+ mHistogramRegistry ->fill (HIST (prefix) + HIST (AnalysisDir) + HIST (getHistName (kMass1VsMass2 , HistTable)), mMass1 , mMass2 );
572557 }
573558
574559 // n-D histograms are only filled if enabled
0 commit comments