Fix neccessary for local merge

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

diff --git a/CORRFW/AliCFTrackKineCuts.h b/CORRFW/AliCFTrackKineCuts.h
index d5cb05b66094edffa94f15f75f62f741821d2b31..3dd8a10df9294c0d4b06de3dcc020b86bb896ffa 100644 (file)
--- a/CORRFW/AliCFTrackKineCuts.h
+++ b/CORRFW/AliCFTrackKineCuts.h
@@ -63,9 +63,8 @@ class AliCFTrackKineCuts : public AliCFCutBase
   ~AliCFTrackKineCuts();
   void Copy(TObject &c) const;
 
-  void GetBitMap(TObject* obj, TBits *bitmap);
   Bool_t IsSelected(TObject* obj);
-  void Init();
+  Bool_t IsSelected(TList* /*list*/) {return kTRUE;}
 
   // cut value setter
   void SetMomentumRange(Double_t momentumMin=0., Double_t momentumMax=1e99) {fMomentumMin=momentumMin; fMomentumMax=momentumMax;}
@@ -81,11 +80,9 @@ class AliCFTrackKineCuts : public AliCFCutBase
   void SetRequireIsCharged(Bool_t b=kFALSE) {fRequireIsCharged=b;}
 
   // QA histograms
-  void FillHistogramsBeforeCuts(TObject* obj) {return FillHistograms(obj,kFALSE);}
-  void FillHistogramsAfterCuts(TObject* obj)  {return FillHistograms(obj,kTRUE);}
   void DrawHistograms(Bool_t drawLogScale=kTRUE);
   void SaveHistograms(const Char_t* dir = 0);
-  void AddQAHistograms(TList *qaList) const;
+  void AddQAHistograms(TList *qaList);
   // QA histogram setter
   // please use indices from the enumeration below
   void SetHistogramBins(Int_t index, Int_t nbins, Double_t *bins);
@@ -108,7 +105,7 @@ class AliCFTrackKineCuts : public AliCFCutBase
   };
 
  private:
-  TBits* SelectionBitMap(TObject* obj);
+  void SelectionBitMap(TObject* obj);
   void DefineHistograms();             // books histograms and TList
   void Initialise();                   // sets everything to 0
   void FillHistograms(TObject* obj, Bool_t b);
@@ -139,15 +136,15 @@ class AliCFTrackKineCuts : public AliCFCutBase
   TBits *fBitmap ;                     // stores single selection decisions
 
   // QA histogram setters
-  Int_t fhNBinsMomentum;               // number of bins: momentum
-  Int_t fhNBinsPt;                     // number of bins: pt
-  Int_t fhNBinsPx;                     // number of bins: px
-  Int_t fhNBinsPy;                     // number of bins: py
-  Int_t fhNBinsPz;                     // number of bins: pz
-  Int_t fhNBinsEta;                    // number of bins: eta
-  Int_t fhNBinsRapidity;               // number of bins: rapidity
-  Int_t fhNBinsPhi;                    // number of bins: phi
-  Int_t fhNBinsCharge;                 // number of bins: charge
+  Int_t fhNBinsMomentum;               // number of bins+1: momentum
+  Int_t fhNBinsPt;                     // number of bins+1: pt
+  Int_t fhNBinsPx;                     // number of bins+1: px
+  Int_t fhNBinsPy;                     // number of bins+1: py
+  Int_t fhNBinsPz;                     // number of bins+1: pz
+  Int_t fhNBinsEta;                    // number of bins+1: eta
+  Int_t fhNBinsRapidity;               // number of bins+1: rapidity
+  Int_t fhNBinsPhi;                    // number of bins+1: phi
+  Int_t fhNBinsCharge;                 // number of bins+1: charge
   
   Double_t *fhBinLimMomentum;  //[fhNBinsMomentum] bin limits: momentum
   Double_t *fhBinLimPt;                //[fhNBinsPt] bin limits: pt