Bug spotted by Raphael.

[u/mrichter/AliRoot.git] / CORRFW / AliCFManager.cxx

diff --git a/CORRFW/AliCFManager.cxx b/CORRFW/AliCFManager.cxx
index e642c82960c81c303824c501c59acba24ddc3a14..3e697868497c5d611155e78598532341ed37088a 100644 (file)
--- a/CORRFW/AliCFManager.cxx
+++ b/CORRFW/AliCFManager.cxx
@@ -100,8 +100,8 @@ Bool_t AliCFManager::CheckParticleCuts(Int_t isel, TObject *obj, const TString
   // check whether object obj passes particle-level selection isel
   //
 
-  if(isel>=fPartContainer->GetNStep()){
-    AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,fPartContainer->GetNStep()));
+  if(isel>=fNStepPart){
+    AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,fNStepPart));
     return kTRUE;
   }
   if(!fPartCutList[isel])return kTRUE;
@@ -121,8 +121,8 @@ Bool_t AliCFManager::CheckEventCuts(Int_t isel, TObject *obj, const TString  &se
   // check whether object obj passes event-level selection isel
   //
 
-  if(isel>=fEvtContainer->GetNStep()){
-    AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,fEvtContainer->GetNStep()));
+  if(isel>=fNStepEvt){
+    AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,fNStepEvt));
       return kTRUE;
   }
   if(!fEvtCutList[isel])return kTRUE;
@@ -137,36 +137,71 @@ Bool_t AliCFManager::CheckEventCuts(Int_t isel, TObject *obj, const TString  &se
 }
 
 //_____________________________________________________________________________
-void  AliCFManager::SetEventInfo(TObject *obj) const {
+void  AliCFManager::SetMCEventInfo(const TObject *obj) const {
 
   //Particle level cuts
 
-  if (!fPartContainer) {
-    AliWarning("No particle container");
+  if (!fPartCutList) {
+    AliWarning("No particle cut list found");
   }
   else {
-    for(Int_t isel=0;isel<fPartContainer->GetNStep(); isel++){
+    for(Int_t isel=0;isel<fNStepPart; isel++){
       if(!fPartCutList[isel])continue;  
       TObjArrayIter iter(fPartCutList[isel]);
       AliCFCutBase *cut = 0;
       while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-       cut->SetEvtInfo(obj);
+       cut->SetMCEventInfo(obj);
       }    
     }
   }
   
   //Event level cuts 
   
-  if (!fEvtContainer) {
-    AliWarning("No event container found");
+  if (!fEvtCutList) {
+    AliWarning("No event cut list found");
   }
   else {
-    for(Int_t isel=0;isel<fEvtContainer->GetNStep(); isel++){
+    for(Int_t isel=0;isel<fNStepEvt; isel++){
       if(!fEvtCutList[isel])continue;  
       TObjArrayIter iter(fEvtCutList[isel]);
       AliCFCutBase *cut = 0;
       while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-       cut->SetEvtInfo(obj);
+       cut->SetMCEventInfo(obj);
+      }   
+    }
+  }
+}
+//_____________________________________________________________________________
+void  AliCFManager::SetRecEventInfo(const TObject *obj) const {
+
+  //Particle level cuts
+
+  if (!fPartCutList) {
+    AliWarning("No particle cut list found");
+  }
+  else {
+    for(Int_t isel=0;isel<fNStepPart; isel++){
+      if(!fPartCutList[isel])continue;  
+      TObjArrayIter iter(fPartCutList[isel]);
+      AliCFCutBase *cut = 0;
+      while ( (cut = (AliCFCutBase*)iter.Next()) ) {
+       cut->SetRecEventInfo(obj);
+      }    
+    }
+  }
+  
+  //Event level cuts 
+  
+  if (!fEvtCutList) {
+    AliWarning("No event cut list found");
+  }
+  else {
+    for(Int_t isel=0;isel<fNStepEvt; isel++){
+      if(!fEvtCutList[isel])continue;  
+      TObjArrayIter iter(fEvtCutList[isel]);
+      AliCFCutBase *cut = 0;
+      while ( (cut = (AliCFCutBase*)iter.Next()) ) {
+       cut->SetRecEventInfo(obj);
       }   
     }
   }
@@ -194,13 +229,15 @@ void AliCFManager::SetEventCutsList(Int_t isel, TObjArray* array) {
   //
 
   if (!fEvtContainer) {
-    AliError("No event container defined, please set it first!"); 
-    return;
+    AliWarning("No event container defined, you may need to set it first!"); 
   }
 
   Int_t nstep = fNStepEvt;
 
-  if (!fEvtCutList) fEvtCutList = new TObjArray*[nstep] ;
+  if (!fEvtCutList) {
+    fEvtCutList = new TObjArray*[nstep] ;
+    for (Int_t i=0; i<nstep; ++i) fEvtCutList[i] = 0;
+  }
   if (isel >= nstep) {
     AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,nstep));
     return;
@@ -215,13 +252,16 @@ void AliCFManager::SetParticleCutsList(Int_t isel, TObjArray* array) {
   //
 
   if (!fPartContainer) {
-    AliError("No event container defined, please set it first!"); 
-    return;
+    AliWarning("No particle container defined, you may need to set it first!"); 
   }
   
   Int_t nstep = fNStepPart ;
   
-  if (!fPartCutList) fPartCutList = new TObjArray*[nstep] ;
+  if (!fPartCutList) {
+    fPartCutList = new TObjArray*[nstep] ;
+    for (Int_t istep = 0; istep < nstep; istep++)  fPartCutList[istep] = 0; 
+  }
+  
   if (isel >= nstep) {
     AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,nstep));
     return;