X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=CORRFW%2FAliCFManager.cxx;h=0a7ce4f6723c9c6bf39393ade5f14fe6048be4cf;hb=5188c2a7793581805a9849d5934f7cb1347217c1;hp=dc81fb17260beb8cb3076171046b4cf28ac3bda7;hpb=84df86a7c999d4d9aea14df0cb691eab5201684c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/CORRFW/AliCFManager.cxx b/CORRFW/AliCFManager.cxx
index dc81fb17260..0a7ce4f6723 100644
--- a/CORRFW/AliCFManager.cxx
+++ b/CORRFW/AliCFManager.cxx
@@ -21,16 +21,16 @@
 // efficiency calculation.
 // prototype version by S.Arcelli silvia.arcelli@cern.ch
 ///////////////////////////////////////////////////////////////////////////
-#include "AliLog.h"
 #include "AliCFCutBase.h"
 #include "AliCFManager.h"
-#include "AliCFContainer.h"
 
 ClassImp(AliCFManager)
 
 //_____________________________________________________________________________
 AliCFManager::AliCFManager() : 
   TNamed(),
+  fNStepEvt(0),
+  fNStepPart(0),
   fEvtContainer(0x0),
   fPartContainer(0x0),
   fEvtCutList(0x0),
@@ -43,6 +43,8 @@ AliCFManager::AliCFManager() :
 //_____________________________________________________________________________
 AliCFManager::AliCFManager(Char_t* name, Char_t* title) : 
   TNamed(name,title),
+  fNStepEvt(0),
+  fNStepPart(0),
   fEvtContainer(0x0),
   fPartContainer(0x0),
   fEvtCutList(0x0),
@@ -55,6 +57,8 @@ AliCFManager::AliCFManager(Char_t* name, Char_t* title) :
 //_____________________________________________________________________________
 AliCFManager::AliCFManager(const AliCFManager& c) : 
   TNamed(c),
+  fNStepEvt(c.fNStepEvt),
+  fNStepPart(c.fNStepPart),
   fEvtContainer(c.fEvtContainer),
   fPartContainer(c.fPartContainer),
   fEvtCutList(c.fEvtCutList),
@@ -74,6 +78,8 @@ AliCFManager& AliCFManager::operator=(const AliCFManager& c)
     TNamed::operator=(c) ;
   }
   
+  this->fNStepEvt=c.fNStepEvt;
+  this->fNStepPart=c.fNStepPart;
   this->fEvtContainer=c.fEvtContainer;
   this->fPartContainer=c.fPartContainer;
   this->fEvtCutList=c.fEvtCutList;
@@ -94,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;
@@ -115,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;
@@ -135,11 +141,11 @@ void  AliCFManager::SetEventInfo(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;
@@ -151,11 +157,11 @@ void  AliCFManager::SetEventInfo(TObject *obj) const {
   
   //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;
@@ -188,11 +194,10 @@ 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 = fEvtContainer->GetNStep() ;
+  Int_t nstep = fNStepEvt;
 
   if (!fEvtCutList) fEvtCutList = new TObjArray*[nstep] ;
   if (isel >= nstep) {
@@ -209,11 +214,10 @@ 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 = fPartContainer->GetNStep() ;
+  Int_t nstep = fNStepPart ;
   
   if (!fPartCutList) fPartCutList = new TObjArray*[nstep] ;
   if (isel >= nstep) {