Move pair types inside the class to conform with rules

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelManager.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelManager.cxx
index d24e3fd5f3fe4ba32123edce224fe160f38a62cd..b07b94fea4760d5834faa1adb4aa15339945db1c 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelManager.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelManager.cxx
@@ -77,73 +77,73 @@ Double_t AliFemtoModelManager::GetWeight(AliFemtoPair *aPair)
     // Try to gess particle masses and pid from the weight generator
     Double_t tMass1, tMass2;
     Int_t tPid1, tPid2;
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkPionPlusPionPlus) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::PionPlusPionPlus()) {
       tMass1 = 0.13957;
       tMass2 = 0.13957;
       tPid1 = 211;
       tPid2 = 211;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkPionPlusPionMinus) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::PionPlusPionMinus()) {
       tMass1 = 0.13957;
       tMass2 = 0.13957;
       tPid1 = 211;
       tPid2 = -211;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkKaonPlusKaonPlus) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::KaonPlusKaonPlus()) {
       tMass1 = 0.493677;
       tMass2 = 0.493677;
       tPid1 = 321;
       tPid2 = 321;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkKaonPlusKaonMinus) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::KaonPlusKaonMinus()) {
       tMass1 = 0.493677;
       tMass2 = 0.493677;
       tPid1 = 321;
       tPid2 = -321;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkProtonProton) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::ProtonProton()) {
       tMass1 = 0.938272;
       tMass2 = 0.938272;
       tPid1 = 2212;
       tPid2 = 2212;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkProtonAntiproton) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::ProtonAntiproton()) {
       tMass1 = 0.938272;
       tMass2 = 0.938272;
       tPid1 = 2212;
       tPid2 = -2212;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkPionPlusKaonPlus) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::PionPlusKaonPlus()) {
       tMass1 = 0.13957;
       tMass2 = 0.493677;
       tPid1 = 211;
       tPid2 = 321;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkPionPlusKaonMinus) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::PionPlusKaonMinus()) {
       tMass1 = 0.13957;
       tMass2 = 0.493677;
       tPid1 = 211;
       tPid2 = -321;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkPionPlusProton) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::PionPlusProton()) {
       tMass1 = 0.13957;
       tMass2 = 0.938272;
       tPid1 = 211;
       tPid2 = 2212;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkPionPlusAntiproton) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::PionPlusAntiproton()) {
       tMass1 = 0.13957;
       tMass2 = 0.938272;
       tPid1 = 211;
       tPid2 = -2212;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkKaonPlusProton) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::KaonPlusProton()) {
       tMass1 = 0.493677;
       tMass2 = 0.938272;
       tPid1 = 321;
       tPid2 = 2212;
     }
-    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::fgkKaonPlusAntiproton) {
+    if (fWeightGenerator->GetPairType() == AliFemtoModelWeightGenerator::KaonPlusAntiproton()) {
       tMass1 = 0.493677;
       tMass2 = 0.938272;
       tPid1 = 321;

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGenerator.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGenerator.h
index 286597bca4cabf470b5a80abcfa552fc86be94ce..e997c45d5c887b262d510528df99bdd91a2841c1 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGenerator.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGenerator.h
@@ -34,6 +34,20 @@ class AliFemtoModelWeightGenerator
 
   virtual AliFemtoModelWeightGenerator* Clone() const;
 
+  static Int_t PionPlusPionPlus();  
+  static Int_t PionPlusPionMinus(); 
+  static Int_t KaonPlusKaonPlus();  
+  static Int_t KaonPlusKaonMinus(); 
+  static Int_t ProtonProton();      
+  static Int_t ProtonAntiproton();  
+  static Int_t PionPlusKaonPlus();  
+  static Int_t PionPlusKaonMinus(); 
+  static Int_t PionPlusProton();    
+  static Int_t PionPlusAntiproton();
+  static Int_t KaonPlusProton();    
+  static Int_t KaonPlusAntiproton();
+
+ protected:
   static const Int_t fgkPionPlusPionPlus;  // identical pion pair
   static const Int_t fgkPionPlusPionMinus; // non-identical pion pair
   static const Int_t fgkKaonPlusKaonPlus;  // identical kaon pair
@@ -47,7 +61,6 @@ class AliFemtoModelWeightGenerator
   static const Int_t fgkKaonPlusProton;    // same-charge kaon proton pair
   static const Int_t fgkKaonPlusAntiproton;// opposite-charge kaon proton pair
 
- protected:
   Int_t fPairType;     // Type of the pair for which the calculation is done
 
   Double_t fKStarOut;  // relative momentum out component in PRF
@@ -76,6 +89,18 @@ inline Double_t AliFemtoModelWeightGenerator::GetRStarOut() const { return fRSta
 inline Double_t AliFemtoModelWeightGenerator::GetRStarSide() const { return fRStarSide; }
 inline Double_t AliFemtoModelWeightGenerator::GetRStarLong() const { return fRStarLong; }
 
+inline Int_t AliFemtoModelWeightGenerator::PionPlusPionPlus() { return fgkPionPlusPionPlus; }  
+inline Int_t AliFemtoModelWeightGenerator::PionPlusPionMinus() { return fgkPionPlusPionMinus; } 
+inline Int_t AliFemtoModelWeightGenerator::KaonPlusKaonPlus() { return fgkKaonPlusKaonPlus; }  
+inline Int_t AliFemtoModelWeightGenerator::KaonPlusKaonMinus() { return fgkKaonPlusKaonMinus; } 
+inline Int_t AliFemtoModelWeightGenerator::ProtonProton() { return fgkProtonProton; }      
+inline Int_t AliFemtoModelWeightGenerator::ProtonAntiproton() { return fgkProtonAntiproton; }  
+inline Int_t AliFemtoModelWeightGenerator::PionPlusKaonPlus() { return fgkPionPlusKaonPlus; }  
+inline Int_t AliFemtoModelWeightGenerator::PionPlusKaonMinus() { return fgkPionPlusKaonMinus; } 
+inline Int_t AliFemtoModelWeightGenerator::PionPlusProton() { return fgkPionPlusProton; }    
+inline Int_t AliFemtoModelWeightGenerator::PionPlusAntiproton() { return fgkPionPlusAntiproton; }
+inline Int_t AliFemtoModelWeightGenerator::KaonPlusProton() { return fgkKaonPlusProton; }    
+inline Int_t AliFemtoModelWeightGenerator::KaonPlusAntiproton() { return fgkKaonPlusAntiproton; }
 
 #endif