From 9f6be3a24cc4b64aa0d233b86f79c1a3cd3e0618 Mon Sep 17 00:00:00 2001 From: rvernet Date: Sun, 18 May 2008 15:44:56 +0000 Subject: [PATCH] Some cleaning and simplification in container-related classes and AliCFManager. --- CORRFW/AliCFDataGrid.cxx | 6 +- CORRFW/AliCFDataGrid.h | 5 -- CORRFW/AliCFEffGrid.cxx | 12 ++- CORRFW/AliCFEffGrid.h | 1 - CORRFW/AliCFFrame.cxx | 4 +- CORRFW/AliCFFrame.h | 2 +- CORRFW/AliCFGrid.cxx | 2 +- CORRFW/AliCFManager.cxx | 171 +-------------------------------------- CORRFW/AliCFManager.h | 17 +--- 9 files changed, 15 insertions(+), 205 deletions(-) diff --git a/CORRFW/AliCFDataGrid.cxx b/CORRFW/AliCFDataGrid.cxx index 5a80f843460..d307e173bfd 100644 --- a/CORRFW/AliCFDataGrid.cxx +++ b/CORRFW/AliCFDataGrid.cxx @@ -25,10 +25,8 @@ //--------------------------------------------------------------------// // // -#include -#include -#include -#include +#include "TMath.h" +#include "AliLog.h" #include "AliCFDataGrid.h" //____________________________________________________________________ diff --git a/CORRFW/AliCFDataGrid.h b/CORRFW/AliCFDataGrid.h index 9a87a26ee6b..3bbcbba4fcc 100644 --- a/CORRFW/AliCFDataGrid.h +++ b/CORRFW/AliCFDataGrid.h @@ -13,11 +13,6 @@ #include "AliCFGrid.h" #include "AliCFEffGrid.h" #include "AliCFContainer.h" -#include -#include -#include -#include -#include class AliCFDataGrid : public AliCFGrid { diff --git a/CORRFW/AliCFEffGrid.cxx b/CORRFW/AliCFEffGrid.cxx index bb1970be5b3..bec4afbe2f5 100644 --- a/CORRFW/AliCFEffGrid.cxx +++ b/CORRFW/AliCFEffGrid.cxx @@ -25,14 +25,12 @@ //--------------------------------------------------------------------// // // -#include -#include -#include -#include +#include "TMath.h" +#include "AliLog.h" #include "AliCFEffGrid.h" -#include -#include -#include +#include "TH1D.h" +#include "TH2D.h" +#include "TH3D.h" //____________________________________________________________________ ClassImp(AliCFEffGrid) diff --git a/CORRFW/AliCFEffGrid.h b/CORRFW/AliCFEffGrid.h index 5394664c265..61e63bb9c1e 100644 --- a/CORRFW/AliCFEffGrid.h +++ b/CORRFW/AliCFEffGrid.h @@ -12,7 +12,6 @@ #include "AliCFGrid.h" #include "AliCFContainer.h" -#include class TH1D; class TH2D; class TH3D; diff --git a/CORRFW/AliCFFrame.cxx b/CORRFW/AliCFFrame.cxx index 4b822e9efb0..3142e7b159a 100644 --- a/CORRFW/AliCFFrame.cxx +++ b/CORRFW/AliCFFrame.cxx @@ -28,8 +28,8 @@ // #include "TSystem.h" -#include -#include +#include "TFile.h" +#include "AliLog.h" #include "AliCFFrame.h" //____________________________________________________________________ diff --git a/CORRFW/AliCFFrame.h b/CORRFW/AliCFFrame.h index 396cf18b651..597e153d400 100644 --- a/CORRFW/AliCFFrame.h +++ b/CORRFW/AliCFFrame.h @@ -10,7 +10,7 @@ // // //--------------------------------------------------------------------// -#include +#include "TNamed.h" class AliCFFrame : public TNamed { diff --git a/CORRFW/AliCFGrid.cxx b/CORRFW/AliCFGrid.cxx index 7be3dc531e6..7e5ff07e5ee 100644 --- a/CORRFW/AliCFGrid.cxx +++ b/CORRFW/AliCFGrid.cxx @@ -27,7 +27,7 @@ //---------------------------------------------------------------------// // // -#include +#include "AliLog.h" #include "AliCFGrid.h" #include "TMath.h" #include "TROOT.h" diff --git a/CORRFW/AliCFManager.cxx b/CORRFW/AliCFManager.cxx index 069aa05099d..156a7774fd2 100644 --- 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;ifEvtContainer=c.fEvtContainer; this->fPartContainer=c.fPartContainer; - this->fhQABits=c.fhQABits; for(Int_t i=0;ifEvtCutList[i]=c.fEvtCutList[i]; for(Int_t i=0;ifPartCutList[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;iselIsQAOn())cut->AddQAHistograms(list); - } - } - - //Event-level cuts QA - - for(Int_t isel=0;iselIsQAOn())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;icutGetNbits();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;iselIsQAOn())cut->Init(); - } - } - - //Event level cuts - - for(Int_t isel=0;iselIsQAOn())cut->Init(); - } - } -} //_____________________________________________________________________________ Bool_t AliCFManager::CompareStrings(const TString &cutname,const TString &selcuts) const{ diff --git a/CORRFW/AliCFManager.h b/CORRFW/AliCFManager.h index f2a16199345..093321499a0 100644 --- 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; -- 2.39.3