made bugfix 25978 into a generic protection

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

diff --git a/CORRFW/AliCFTrackIsPrimaryCuts.h b/CORRFW/AliCFTrackIsPrimaryCuts.h
index 94e79b1cc66f824ba007fa42f6de3c646e0f109f..e7a5b8e9d59a3e2c258036cc206072a580aac1ad 100644 (file)
--- a/CORRFW/AliCFTrackIsPrimaryCuts.h
+++ b/CORRFW/AliCFTrackIsPrimaryCuts.h
@@ -56,10 +56,9 @@ class AliCFTrackIsPrimaryCuts : public AliCFCutBase
   ~AliCFTrackIsPrimaryCuts();
   void Copy(TObject &c) const;
 
-  void GetBitMap(TObject* obj, TBits *bitmap);
   Bool_t IsSelected(TObject* obj);
-  void Init();
-  Float_t GetSigmaToVertex(AliESDtrack* esdTrack) const;
+  Bool_t IsSelected(TList* /*list*/) {return kTRUE;}
+  void GetSigmaToVertex(AliESDtrack* esdTrack);
 
   // cut value setter
   void SetMaxNSigmaToVertex(Double_t sigma=3)  {fNSigmaToVertexMax = sigma;}
@@ -67,11 +66,9 @@ class AliCFTrackIsPrimaryCuts : public AliCFCutBase
   void SetAcceptKinkDaughters(Bool_t b=kTRUE)  {fAcceptKinkDaughters=b;}
 
   // QA histograms
-  void FillHistogramsBeforeCuts(TObject* obj) {return FillHistograms(obj,kFALSE);}
-  void FillHistogramsAfterCuts(TObject* obj)  {return FillHistograms(obj,kTRUE);}
   void DrawHistograms();
   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);
@@ -92,12 +89,13 @@ class AliCFTrackIsPrimaryCuts : 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);
                                        // Fills histograms before and after cuts
-  Double_t fNSigmaToVertexMax;         // max distance to main vertex in units of sigma
+  Double_t fNSigmaToVertex;            // track distance to main vertex in units of sigma
+  Double_t fNSigmaToVertexMax;         // cut value: max distance to main vertex in units of sigma
   Bool_t  fRequireSigmaToVertex;       // require calculable distance to main vertex
 
   TH2F* fhDcaXYvsDcaZ[2];              // Histogram: dca xy vs. z
@@ -111,13 +109,13 @@ class AliCFTrackIsPrimaryCuts : public AliCFCutBase
   TBits *fBitmap ;                     // stores single selection decisions
 
   // QA histogram setters
-  Int_t fhNBinsNSigma;                 // number of bins: dca in units of sigma
-  Int_t fhNBinsRequireSigma;           // number of bins: require successful calcuation
-  Int_t fhNBinsAcceptKink;             // number of bins: acceptkink daughters
-  Int_t fhNBinsDcaXY;                  // number of bins: dca in transverse plane
-  Int_t fhNBinsDcaZ;                   // number of bins: dca along beam axis
-  Int_t fhNBinsDcaXYnorm;              // number of bins: normalised dca in transverse plane
-  Int_t fhNBinsDcaZnorm;               // number of bins: normalised dca along beam axis
+  Int_t fhNBinsNSigma;                 // number of bins+1: dca in units of sigma
+  Int_t fhNBinsRequireSigma;           // number of bins+1: require successful calcuation
+  Int_t fhNBinsAcceptKink;             // number of bins+1: acceptkink daughters
+  Int_t fhNBinsDcaXY;                  // number of bins+1: dca in transverse plane
+  Int_t fhNBinsDcaZ;                   // number of bins+1: dca along beam axis
+  Int_t fhNBinsDcaXYnorm;              // number of bins+1: normalised dca in transverse plane
+  Int_t fhNBinsDcaZnorm;               // number of bins+1: normalised dca along beam axis
 
   Double_t *fhBinLimNSigma; //[fhNBinsNSigma] bin limits: dca in units of sigma
   Double_t *fhBinLimRequireSigma;//[fhNBinsRequireSigma] bin limits: require successful calcuation