Some cleaning and simplification in container-related classes and

AliCFManager.

diff --git a/CORRFW/AliCFDataGrid.cxx b/CORRFW/AliCFDataGrid.cxx
index 5a80f843460fbff25fbb24dd4dac158a0dea375c..d307e173bfde612550112082078887b086c1023e 100644 (file)
--- a/CORRFW/AliCFDataGrid.cxx
+++ b/CORRFW/AliCFDataGrid.cxx
@@ -25,10 +25,8 @@
 //--------------------------------------------------------------------//
 //
 //
-#include <TROOT.h>
-#include <TMath.h>
-#include <TFile.h>
-#include <AliLog.h>
+#include "TMath.h"
+#include "AliLog.h"
 #include "AliCFDataGrid.h"
 
 //____________________________________________________________________

diff --git a/CORRFW/AliCFDataGrid.h b/CORRFW/AliCFDataGrid.h
index 9a87a26ee6b13c33f09b0752f5ec68fbf66b8afc..3bbcbba4fcc823aaad574cb6a317d606723ced5d 100644 (file)
--- a/CORRFW/AliCFDataGrid.h
+++ b/CORRFW/AliCFDataGrid.h
@@ -13,11 +13,6 @@
 #include "AliCFGrid.h"
 #include "AliCFEffGrid.h"
 #include "AliCFContainer.h"
-#include <TNamed.h>
-#include <TTree.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TH3F.h>
 
 class AliCFDataGrid : public AliCFGrid
 {

diff --git a/CORRFW/AliCFEffGrid.cxx b/CORRFW/AliCFEffGrid.cxx
index bb1970be5b3b7572b02c0dc0cf59f95ad7fd6ab1..bec4afbe2f525bd05d279b3ea522131d50f8fba2 100644 (file)
--- a/CORRFW/AliCFEffGrid.cxx
+++ b/CORRFW/AliCFEffGrid.cxx
@@ -25,14 +25,12 @@
 //--------------------------------------------------------------------//
 //
 //
-#include <TROOT.h>
-#include <TMath.h>
-#include <TFile.h>
-#include <AliLog.h>
+#include "TMath.h"
+#include "AliLog.h"
 #include "AliCFEffGrid.h"
-#include <TH1D.h>
-#include <TH2D.h>
-#include <TH3D.h>
+#include "TH1D.h"
+#include "TH2D.h"
+#include "TH3D.h"
 
 //____________________________________________________________________
 ClassImp(AliCFEffGrid)

diff --git a/CORRFW/AliCFEffGrid.h b/CORRFW/AliCFEffGrid.h
index 5394664c2654e37404a2ce6b3c9bc8bafd8f3a70..61e63bb9c1ea69e083348a298a7015ffcf046d31 100644 (file)
--- a/CORRFW/AliCFEffGrid.h
+++ b/CORRFW/AliCFEffGrid.h
@@ -12,7 +12,6 @@
 
 #include "AliCFGrid.h"
 #include "AliCFContainer.h"
-#include <TTree.h>
 class TH1D;
 class TH2D;
 class TH3D;

diff --git a/CORRFW/AliCFFrame.cxx b/CORRFW/AliCFFrame.cxx
index 4b822e9efb0423ea32ffa3b75523718cc05a3afa..3142e7b159a2033c62b16437ef00ebbe4343c039 100644 (file)
--- a/CORRFW/AliCFFrame.cxx
+++ b/CORRFW/AliCFFrame.cxx
@@ -28,8 +28,8 @@
 //
 
 #include "TSystem.h"
-#include <TFile.h>
-#include <AliLog.h>
+#include "TFile.h"
+#include "AliLog.h"
 #include "AliCFFrame.h"
 
 //____________________________________________________________________

diff --git a/CORRFW/AliCFFrame.h b/CORRFW/AliCFFrame.h
index 396cf18b6517a7272039d446a1426e254de895e0..597e153d400d33e8e51ad27bbe67e0bba314a5c7 100644 (file)
--- a/CORRFW/AliCFFrame.h
+++ b/CORRFW/AliCFFrame.h
@@ -10,7 +10,7 @@
 //                                                                    //
 //--------------------------------------------------------------------//
 
-#include <TNamed.h>
+#include "TNamed.h"
 
 class AliCFFrame : public TNamed
 {

diff --git a/CORRFW/AliCFGrid.cxx b/CORRFW/AliCFGrid.cxx
index 7be3dc531e61ef53fbe12e9080ab2cc5205c7f7c..7e5ff07e5eebb922656547e8a94522c8c691ef4f 100644 (file)
--- a/CORRFW/AliCFGrid.cxx
+++ b/CORRFW/AliCFGrid.cxx
@@ -27,7 +27,7 @@
 //---------------------------------------------------------------------//
 //
 //
-#include <AliLog.h>
+#include "AliLog.h"
 #include "AliCFGrid.h"
 #include "TMath.h"
 #include "TROOT.h"

diff --git a/CORRFW/AliCFManager.cxx b/CORRFW/AliCFManager.cxx
index 069aa05099d85a3465f37a8ba8c40ee65d5e090b..156a7774fd2e9b8781934d000378d04039960626 100644 (file)
--- a/CORRFW/AliCFManager.cxx
+++ b/CORRFW/AliCFManager.cxx
@@ -21,9 +21,6 @@
 // efficiency calculation.
 // prototype version by S.Arcelli silvia.arcelli@cern.ch
 ///////////////////////////////////////////////////////////////////////////
-#include "TBits.h"
-#include "TList.h"
-#include "TH1.h"
 #include "AliLog.h"
 #include "AliCFCutBase.h"
 #include "AliCFManager.h"
@@ -34,37 +31,31 @@ ClassImp(AliCFManager)
 AliCFManager::AliCFManager() : 
   TNamed(),
   fEvtContainer(0x0),
-  fPartContainer(0x0),
-  fhQABits(0x0)
-
+  fPartContainer(0x0)
 { 
   //
   // ctor
   //
   for(Int_t i=0;i<kNEvtSel;i++)fEvtCutList[i]=0x0;
   for(Int_t i=0;i<kNPartSel;i++)fPartCutList[i]=0x0;
-  fhQABits=new TBits(0);
 }
 //_____________________________________________________________________________
 AliCFManager::AliCFManager(Char_t* name, Char_t* title) : 
   TNamed(name,title),
   fEvtContainer(0x0),
-  fPartContainer(0x0),
-  fhQABits(0x0)
+  fPartContainer(0x0)
  { 
    //
    // ctor
    //
   for(Int_t i=0;i<kNEvtSel;i++)fEvtCutList[i]=0x0;
   for(Int_t i=0;i<kNPartSel;i++)fPartCutList[i]=0x0;
-  fhQABits=new TBits(0);
 }
 //_____________________________________________________________________________
 AliCFManager::AliCFManager(const AliCFManager& c) : 
   TNamed(c),
   fEvtContainer(c.fEvtContainer),
-  fPartContainer(c.fPartContainer),
-  fhQABits(c.fhQABits)
+  fPartContainer(c.fPartContainer)
  { 
    //
    //copy ctor
@@ -84,7 +75,6 @@ AliCFManager& AliCFManager::operator=(const AliCFManager& c)
 
   this->fEvtContainer=c.fEvtContainer;
   this->fPartContainer=c.fPartContainer;
-  this->fhQABits=c.fhQABits;
   for(Int_t i=0;i<kNEvtSel;i++)this->fEvtCutList[i]=c.fEvtCutList[i];
   for(Int_t i=0;i<kNPartSel;i++)this->fPartCutList[i]=c.fPartCutList[i];
   return *this ;
@@ -95,7 +85,6 @@ AliCFManager::~AliCFManager() {
    //
    //dtor
    //
-  if(fhQABits) delete fhQABits;
 }
 
 //_____________________________________________________________________________
@@ -140,135 +129,6 @@ Bool_t AliCFManager::CheckEventCuts(Int_t isel, TObject *obj, const TString  &se
   return kTRUE;
 }
 
-//_____________________________________________________________________________
-void AliCFManager::FillQABeforeParticleCuts(Int_t isel, TObject *obj) const{
-  //
-  // Fill QA histos before cuts at particle selection level isel are applied
-  //
-
-  if(isel>=kNPartSel){
-    AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,kNPartSel));
-      return;
-  }
-  if(!fPartCutList[isel])return;
-
-  TObjArrayIter iter(fPartCutList[isel]);
-  AliCFCutBase *cut = 0;
-  while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-    if(cut->IsQAOn())cut->FillHistogramsBeforeCuts(obj);   
-  }
-}
-//_____________________________________________________________________________
-void AliCFManager::FillQAAfterParticleCuts(Int_t isel, TObject *obj) const{
-  //
-  // Fill QA histos after cuts at particle selection level isel are applied
-  //
-  if(isel>=kNPartSel){
-    AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,kNPartSel));
-      return;
-  }
-  if(!fPartCutList[isel])return;
-
-  TObjArrayIter iter(fPartCutList[isel]);
-  AliCFCutBase *cut = 0;
-  while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-    if(cut->IsQAOn())cut->FillHistogramsAfterCuts(obj);   
-  }
-}
-
-//_____________________________________________________________________________
-void AliCFManager::FillQABeforeEventCuts(Int_t isel, TObject *obj) const{
-  //
-  // Fill QA histos before cuts at event selection level isel are applied
-  //
-
-  if(isel>=kNEvtSel){
-    AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,kNEvtSel));
-      return;
-  }
-  if(!fEvtCutList[isel])return;
-
-  TObjArrayIter iter(fEvtCutList[isel]);
-  AliCFCutBase *cut = 0;
-  while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-    if(cut->IsQAOn())cut->FillHistogramsBeforeCuts(obj);   
-  }
-}
-
-//_____________________________________________________________________________
-void AliCFManager::FillQAAfterEventCuts(Int_t isel, TObject *obj) const{
-  //
-  // Fill QA histos after cuts at event selection level isel are applied
-  //
-
-  if(isel>=kNEvtSel){
-    AliWarning(Form("Selection index out of Range! isel=%i, max. number of selections= %i", isel,kNEvtSel));
-      return;
-  }
-  if(!fEvtCutList[isel])return;
-
-  TObjArrayIter iter(fEvtCutList[isel]);
-  AliCFCutBase *cut = 0;
-  while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-    if(cut->IsQAOn())cut->FillHistogramsAfterCuts(obj);   
-  }
-}
-
-//_____________________________________________________________________________
-void AliCFManager::AddQAHistosToList(TList *list) const {
-  //
-  // Add to list the full list of QA histograms to be written to the output
-  //
-
-  for(Int_t isel=0;isel<kNPartSel; isel++){
-    if(!fPartCutList[isel])continue;  
-    TObjArrayIter iter(fPartCutList[isel]);
-    AliCFCutBase *cut = 0;
-    while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-      if(cut->IsQAOn())cut->AddQAHistograms(list);     
-    }
-  }  
-
-  //Event-level cuts QA
-
-  for(Int_t isel=0;isel<kNEvtSel; isel++){
-    if(!fEvtCutList[isel])continue;  
-    TObjArrayIter iter(fEvtCutList[isel]);
-    AliCFCutBase *cut = 0;
-    while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-      if(cut->IsQAOn())cut->AddQAHistograms(list);
-    }
-  }    
-}
-//_____________________________________________________________________________
-TBits* AliCFManager::GetQAParticleSelBits(Int_t isel, TObject *obj) {
-  //
-  // Get the full list of QA histograms to be written to the output
-  //
-
-  fhQABits->Clear(); //reset the list
-  
-  //Particle-level cuts QA
-
-  if(fPartCutList[isel]){  
-    TObjArrayIter iter(fPartCutList[isel]);
-    AliCFCutBase *cut = 0;
-    while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-      if(cut->IsQAOn()){
-       TBits *qalist=new TBits(0);
-       cut->GetBitMap(obj,qalist);
-       for(UInt_t icut=0;icut<qalist->GetNbits();icut++){
-         fhQABits->SetBitNumber(icut,qalist->TestBitNumber(icut));    
-       }
-       delete qalist;
-      }
-    }    
-  }
-
-  return fhQABits;
-
-}
-
 //_____________________________________________________________________________
 void  AliCFManager::SetEventInfo(TObject *obj) const {
 
@@ -294,31 +154,6 @@ void  AliCFManager::SetEventInfo(TObject *obj) const {
     }    
   }
 }
-//_____________________________________________________________________________
-void  AliCFManager::InitQAHistos() const {
-
-  //Particle level cuts
-
-  for(Int_t isel=0;isel<kNPartSel; isel++){
-    if(!fPartCutList[isel])continue;  
-    TObjArrayIter iter(fPartCutList[isel]);
-    AliCFCutBase *cut = 0;
-    while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-      if(cut->IsQAOn())cut->Init();
-    }    
-  }
-  
-  //Event level cuts 
-
-  for(Int_t isel=0;isel<kNEvtSel; isel++){
-    if(!fEvtCutList[isel])continue;  
-    TObjArrayIter iter(fEvtCutList[isel]);
-    AliCFCutBase *cut = 0;
-    while ( (cut = (AliCFCutBase*)iter.Next()) ) {
-      if(cut->IsQAOn())cut->Init();
-    }    
-  }
-}
 
 //_____________________________________________________________________________
 Bool_t AliCFManager::CompareStrings(const TString  &cutname,const TString  &selcuts) const{

diff --git a/CORRFW/AliCFManager.h b/CORRFW/AliCFManager.h
index f2a1619934549b6fa57626af598533fdcf2e0be2..093321499a0e59703980e2845e96384bc15c4477 100644 (file)
--- a/CORRFW/AliCFManager.h
+++ b/CORRFW/AliCFManager.h
@@ -20,12 +20,8 @@
 
 #include "TNamed.h"
 
-class TObject;
-class TList;
-class TBits;
 class AliCFContainer ;
-class AliMCEventHandler ;
-class AliGenEventHeader ;
+
 //____________________________________________________________________________
 class AliCFManager : public TNamed 
 {
@@ -103,16 +99,6 @@ class AliCFManager : public TNamed
   virtual Bool_t CheckEventCuts(Int_t isel, TObject *obj, const TString &selcuts="all") const;
   virtual Bool_t CheckParticleCuts(Int_t isel, TObject *obj, const TString &selcuts="all") const;
 
-  virtual void FillQABeforeEventCuts(Int_t isel, TObject *obj) const;
-  virtual void FillQAAfterEventCuts(Int_t isel, TObject *obj) const;
-  virtual void FillQABeforeParticleCuts(Int_t isel, TObject *obj) const;
-  virtual void FillQAAfterParticleCuts(Int_t isel, TObject *obj) const;
-
-  virtual void InitQAHistos() const;//init QA histograms
-  virtual TBits*  GetQAParticleSelBits(Int_t isel, TObject *obj);//get cut mask
-  virtual void AddQAHistosToList(TList *list) const; //put the QA histos in TList
-  
-  
  private:
 
   //the correction grid
@@ -123,7 +109,6 @@ class AliCFManager : public TNamed
   TObjArray *fEvtCutList[kNEvtSel]; //arrays of cuts: gen,trig,rec-level
   //Particle-level selections
   TObjArray *fPartCutList[kNPartSel]; //arrays of cuts: gen,acceptance,rec,sel-level
-  TBits *fhQABits; // Global list of Cuts' QA BitMaps
 
   Bool_t CompareStrings(const TString  &cutname,const TString  &selcuts) const;