New support for QA histos

[u/mrichter/AliRoot.git] / CORRFW / AliCFEventClassCuts.h

diff --git a/CORRFW/AliCFEventClassCuts.h b/CORRFW/AliCFEventClassCuts.h
index a09a14edf0d46f0b3acf2bc6bb580d1645d5a826..2e29b101e0ce264ba766fcdc1fd347e3568826a2 100644 (file)
--- a/CORRFW/AliCFEventClassCuts.h
+++ b/CORRFW/AliCFEventClassCuts.h
@@ -38,9 +38,6 @@ class AliCFEventClassCuts: public AliCFCutBase
   ~AliCFEventClassCuts();
   Bool_t IsSelected(TObject* obj);
   Bool_t IsSelected(TList* /*list*/) {return kTRUE;}
-  void Init();
-  void GetBitMap(TObject *obj,  TBits *bitmap);
-  void AddQAHistograms(TList *list) const;
 
   //Association to The Trigger bits in the mask. 
   //They correspond to the PP running descriptor as in 
@@ -84,9 +81,6 @@ class AliCFEventClassCuts: public AliCFCutBase
   Double_t  GetZDCEM2EnergyCutMax() const {return fZDCEM2EnergyMax;};//ZDC EM2 Emax
 
 
-  // QA histograms
-  void FillHistogramsBeforeCuts(TObject* obj) {return FillHistograms(obj,kFALSE);}
-  void FillHistogramsAfterCuts(TObject* obj)  {return FillHistograms(obj,kTRUE);}
   // QA histogram setter
   // please use indices from the enumeration below
   void SetHistogramBins(Int_t index, Int_t nbins, Double_t *bins);
@@ -103,10 +97,11 @@ class AliCFEventClassCuts: public AliCFCutBase
         kNCuts=7,
          kNStepQA=2
         };
- private:
-  TBits* SelectionBitMap(TObject* obj);
+ protected:
+  void SelectionBitMap(TObject* obj);
   static void TriggerBitMap(AliVEvent* ev,TBits *bitmapT);
   void DefineHistograms();             // books histograms and TList
+  void AddQAHistograms(TList *qaList) ;
   void Initialise();                   // sets everything to 0
   void FillHistograms(TObject* obj, Bool_t b);
 
@@ -126,24 +121,8 @@ class AliCFEventClassCuts: public AliCFCutBase
   Double_t fZDCEM2EnergyMax; //Max Energy in ZDCEM2
 
   TBits *fBitMap ; //cut mask
-
   TH1F* fhQA[kNCuts][kNStepQA];                // QA Histograms
-  //QA Histogram parameters
-  Int_t fhNBinsTrigger;//size of array of bin limits, Trigger Mask
-  Double_t *fhBinLimTrigger;//[fhNBinsTrigger] bin limits, Trigger Mask
-  Int_t fhNBinsZDCEnN1;//size of array of bin limits, Energy in ZDC N1
-  Double_t *fhBinLimZDCEnN1;//[fhNBinsZDCEnN1] bin limits, Energy in ZDC N1
-  Int_t fhNBinsZDCEnP1;//size of array of bin limits, Energy in ZDC P1
-  Double_t *fhBinLimZDCEnP1;//[fhNBinsZDCEnP1] bin limits, Energy in ZDC P1
-  Int_t fhNBinsZDCEnN2;//size of array of bin limits, Energy in ZDC N2
-  Double_t *fhBinLimZDCEnN2;//[fhNBinsZDCEnN2] bin limits, Energy in ZDC N2
-  Int_t fhNBinsZDCEnP2;//size of array of bin limits, Energy in ZDC P2
-  Double_t *fhBinLimZDCEnP2;//[fhNBinsZDCEnP2] bin limits, Energy in ZDC P2
-  Int_t fhNBinsZDCEnEM1;//size of array of bin limits, Energy in ZDC EM1
-  Double_t *fhBinLimZDCEnEM1;//[fhNBinsZDCEnEM1] bin limits, Energy in ZDC EM1
-  Int_t fhNBinsZDCEnEM2;//size of array of bin limits, Energy in ZDC EM2
-  Double_t *fhBinLimZDCEnEM2;//[fhNBinsZDCEnEM1] bin limits, Energy in ZDC EM2
  
-  ClassDef(AliCFEventClassCuts,1);
+  ClassDef(AliCFEventClassCuts,2);
 };
 #endif