Cut Property enum moved to BaseCut -> Not to pollute global name space

diff --git a/ANALYSIS/AliEventBaseCut.h b/ANALYSIS/AliEventBaseCut.h
index 9ba71a4b3774425183662263ee9625bc00d85d2d..fecd991f3ad889c687a8a3bc3569bd223dc387bd 100644 (file)
--- a/ANALYSIS/AliEventBaseCut.h
+++ b/ANALYSIS/AliEventBaseCut.h
@@ -15,18 +15,14 @@
 
 class AliAOD;
 
 
 class AliAOD;
 

-enum EEventCutProperty
- {
-   kPrimVertexXCut,
-   kPrimVertexYCut,
-   kPrimVertexZCut,
-   kNChargedCut,
-   kNone
- };
-

 class AliEventBaseCut: public TObject
 {
   public: 
 class AliEventBaseCut: public TObject
 {
   public: 

+    enum EEventCutProperty {
+       kPrimVertexXCut,kPrimVertexYCut,kPrimVertexZCut,
+       kNChargedCut,kNone
+     };
+

     AliEventBaseCut();
     AliEventBaseCut(Double_t min,Double_t max, EEventCutProperty prop = kNone);
     virtual ~AliEventBaseCut(){}
     AliEventBaseCut();
     AliEventBaseCut(Double_t min,Double_t max, EEventCutProperty prop = kNone);
     virtual ~AliEventBaseCut(){}

diff --git a/ANALYSIS/AliEventCut.cxx b/ANALYSIS/AliEventCut.cxx
index af3cb707586f9eed0bc908480e8dcb17b1b57bd1..fc32fa12f1e778273385378950972c8017d44cbe 100644 (file)
--- a/ANALYSIS/AliEventCut.cxx
+++ b/ANALYSIS/AliEventCut.cxx
@@ -67,7 +67,7 @@ void AliEventCut::AddBasePartCut(AliEventBaseCut* ebcut)
     return;
   }
  
     return;
   }
  

- if (ebcut->GetProperty() != kNone)
+ if (ebcut->GetProperty() != AliEventBaseCut::kNone)

   {
     if (FindCut(ebcut->GetProperty()))
      {
   {
     if (FindCut(ebcut->GetProperty()))
      {


@@ -80,7 +80,7 @@ void AliEventCut::AddBasePartCut(AliEventBaseCut* ebcut)
 }
 /*********************************************************/
 
 }
 /*********************************************************/
 

-AliEventBaseCut* AliEventCut::FindCut(EEventCutProperty prop)
+AliEventBaseCut* AliEventCut::FindCut(AliEventBaseCut::EEventCutProperty prop)

 {
 //Finds and returns pointer to the cut with given property
  Int_t n = fBaseCuts.GetEntries();
 {
 //Finds and returns pointer to the cut with given property
  Int_t n = fBaseCuts.GetEntries();


@@ -99,7 +99,7 @@ AliEventBaseCut* AliEventCut::FindCut(EEventCutProperty prop)
 void AliEventCut::SetNChargedRange(Int_t min,Int_t max,Double_t etamin,Double_t etamax)
 {
  //Sets renge of number of charged particles
 void AliEventCut::SetNChargedRange(Int_t min,Int_t max,Double_t etamin,Double_t etamax)
 {
  //Sets renge of number of charged particles

-  AliNChargedCut* cut = dynamic_cast<AliNChargedCut*>(FindCut(kNChargedCut));
+  AliNChargedCut* cut = dynamic_cast<AliNChargedCut*>(FindCut(AliEventBaseCut::kNChargedCut));

   if(cut) 
    { 
      cut->SetRange(min,max);
   if(cut) 
    { 
      cut->SetRange(min,max);

diff --git a/ANALYSIS/AliEventCut.h b/ANALYSIS/AliEventCut.h
index 7c45ba78f703f6931d412f5229296dfc5a57fa57..ec03a6c44c45cf1ba32876cb5108b4c162c659d6 100644 (file)
--- a/ANALYSIS/AliEventCut.h
+++ b/ANALYSIS/AliEventCut.h
@@ -17,7 +17,7 @@
 #include "AliEventBaseCut.h"
 
 class AliAOD;
 #include "AliEventBaseCut.h"
 
 class AliAOD;

-enum EEventCutProperty;
+enum AliEventBaseCut::EEventCutProperty;

 
 class AliEventCut: public TObject
 {
 
 class AliEventCut: public TObject
 {


@@ -32,7 +32,7 @@ class AliEventCut: public TObject
     void           SetNChargedRange(Int_t min,Int_t max, Double_t etamin = -10.0,Double_t etamax = 10.0);
     
   protected:
     void           SetNChargedRange(Int_t min,Int_t max, Double_t etamin = -10.0,Double_t etamax = 10.0);
     
   protected:

-    AliEventBaseCut* FindCut(EEventCutProperty prop);
+    AliEventBaseCut* FindCut(AliEventBaseCut::EEventCutProperty prop);

     
     TObjArray fBaseCuts;
   private:
     
     TObjArray fBaseCuts;
   private:


@@ -45,7 +45,7 @@ class AliEventEmptyCut: public TObject
     AliEventEmptyCut(){}
     virtual ~AliEventEmptyCut(){}
     
     AliEventEmptyCut(){}
     virtual ~AliEventEmptyCut(){}
     

-    Bool_t Rejected(AliAOD* aod) const {return kFALSE;}//always accept
+    Bool_t Rejected(AliAOD* /*aod*/) const {return kFALSE;}//always accept

     
   protected:
   private:
     
   protected:
   private: