Additional safety check introduced

[u/mrichter/AliRoot.git] / ANALYSIS / AliEventCut.cxx

diff --git a/ANALYSIS/AliEventCut.cxx b/ANALYSIS/AliEventCut.cxx
index 9124460c5a245db4fd129a7b23dac8e025496bcb..fc32fa12f1e778273385378950972c8017d44cbe 100644 (file)
--- a/ANALYSIS/AliEventCut.cxx
+++ b/ANALYSIS/AliEventCut.cxx
@@ -40,7 +40,7 @@ AliEventCut::~AliEventCut()
 
 /*********************************************************/
 
-Bool_t AliEventCut::Pass(AliAOD* aod) const
+Bool_t AliEventCut::Rejected(AliAOD* aod) const
 {
   //returns kTRUE if rejected
   if (aod == 0x0)
@@ -53,7 +53,7 @@ Bool_t AliEventCut::Pass(AliAOD* aod) const
   AliEventBaseCut* becut;
   while (( becut = (AliEventBaseCut*)iter() ))
    {
-     if (becut->Pass(aod)) return kTRUE;
+     if (becut->Rejected(aod)) return kTRUE;
    }
   return kFALSE;
 }
@@ -67,7 +67,7 @@ void AliEventCut::AddBasePartCut(AliEventBaseCut* ebcut)
     return;
   }
  
- if (ebcut->GetProperty() != kNone)
+ if (ebcut->GetProperty() != AliEventBaseCut::kNone)
   {
     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();
@@ -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
-  AliNChargedCut* cut = dynamic_cast<AliNChargedCut*>(FindCut(kNChargedCut));
+  AliNChargedCut* cut = dynamic_cast<AliNChargedCut*>(FindCut(AliEventBaseCut::kNChargedCut));
   if(cut) 
    { 
      cut->SetRange(min,max);