Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGDQ / dielectron / AliDielectronHistos.h

diff --git a/PWGDQ/dielectron/AliDielectronHistos.h b/PWGDQ/dielectron/AliDielectronHistos.h
index e4e005e04c50e2609e9455b53453a892fc58ab7d..e2626d80624ed9c721badb161ab358c8bd3aba86 100644 (file)
--- a/PWGDQ/dielectron/AliDielectronHistos.h
+++ b/PWGDQ/dielectron/AliDielectronHistos.h
@@ -21,6 +21,7 @@
 #include <THashList.h>
 #include <TVectorDfwd.h>
 #include <THnBase.h>
+#include <TBits.h>
 
 class TH1;
 class TString;
@@ -87,8 +88,9 @@ public:
   void UserSparse(   const char* histClass, Int_t ndim, TObjArray *limits, UInt_t *vars, UInt_t valTypeW=kNoWeights);
 
   void UserHistogram(const char* histClass,const char *name, const char* title,
-                     Int_t nbinsX, Double_t xmin, Double_t xmax, UInt_t valTypeX, Bool_t logBinX=kFALSE)
-  { UserProfile(histClass,name,title,kNoProfile,nbinsX,xmin,xmax,valTypeX,logBinX); }
+                     Int_t nbinsX, Double_t xmin, Double_t xmax, UInt_t valTypeX, Bool_t logBinX=kFALSE,
+                    UInt_t valTypeW=kNoWeights)
+  { UserProfile(histClass,name,title,kNoProfile,nbinsX,xmin,xmax,valTypeX,logBinX,"",valTypeW); }
 
   void UserHistogram(const char* histClass,const char *name, const char* title,
                      Int_t nbinsX, Double_t xmin, Double_t xmax, Int_t nbinsY, Double_t ymin, Double_t ymax,
@@ -104,15 +106,14 @@ public:
   { UserProfile(histClass,name,title,kNoProfile,nbinsX,xmin,xmax,nbinsY,ymin,ymax,nbinsZ,zmin,zmax,valTypeX,valTypeY,valTypeZ,logBinX,logBinY,logBinZ,valTypeW); }
 
   void UserHistogram(const char* histClass,const char *name, const char* title,
-                     const char* binning, UInt_t valTypeX)
-  { UserProfile(histClass,name,title,kNoProfile,binning,valTypeX); }
-
-  void UserHistogram(const char* histClass,const char *name, const char* title,
-                     const TVectorD * const binsX, UInt_t valTypeX)
-  { UserProfile(histClass,name,title,kNoProfile,binsX,valTypeX); }
+                     const char* binning, UInt_t valTypeX, UInt_t valTypeW=kNoWeights)
+  { UserProfile(histClass,name,title,kNoProfile,binning,valTypeX,"",valTypeW); }
+  //  void UserHistogram(const char* histClass,const char *name, const char* title,
+  //                     const TVectorD * const binsX, UInt_t valTypeX)
+  //  { UserProfile(histClass,name,title,kNoProfile,binsX,valTypeX); }
 
   void UserHistogram(const char* histClass,const char *name, const char* title,
-                    const TVectorD * const binsX, UInt_t valTypeX, UInt_t valTypeW)
+                    const TVectorD * const binsX, UInt_t valTypeX, UInt_t valTypeW=kNoWeights)
   { UserProfile(histClass,name,title,kNoProfile,binsX,valTypeX,"",valTypeW); }
 
   void UserHistogram(const char* histClass,const char *name, const char* title,
@@ -156,6 +157,7 @@ public:
 
   void SetList(TList * const list) { fList=list; }
   TList *GetList() const { return fList; }
+       TBits *GetUsedVars() const { return fUsedVars; }
 
   void AddClass(const char* histClass);
 
@@ -189,8 +191,10 @@ private:
 
   void FillVarArray(TObject *obj, UInt_t *valType);
 
+  
   THashList fHistoList;             //-> list of histograms
   TList    *fList;                  //! List of list of histograms
+       TBits     *fUsedVars;            // list of used variables
 
   TString *fReservedWords;          //! list of reserved words
   void UserHistogramReservedWords(const char* histClass, const TObject *hist, UInt_t valTypes);
@@ -205,7 +209,7 @@ private:
   AliDielectronHistos(const AliDielectronHistos &hist);
   AliDielectronHistos& operator = (const AliDielectronHistos &hist);
 
-  ClassDef(AliDielectronHistos,2)
+  ClassDef(AliDielectronHistos,3)
 };
 
 #endif