Merge branch 'feature-movesplit'

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

diff --git a/PWGDQ/dielectron/AliDielectronHFhelper.h b/PWGDQ/dielectron/AliDielectronHFhelper.h
index 75d5f6638d7fa049f5f7f5b07d87ad0506fcc044..d875699e738048949349328a0a0aa6f54b1843c3 100644 (file)
--- a/PWGDQ/dielectron/AliDielectronHFhelper.h
+++ b/PWGDQ/dielectron/AliDielectronHFhelper.h
@@ -22,7 +22,6 @@
 
 class AliDielectronHFhelper : public TNamed {
 public:
-  enum ECollectType { kSE=0, kME, kMEOS, kROT, kAll };
   enum { kMaxCuts=20 };
 
   //AliDielectronHFhelper();
@@ -36,19 +35,28 @@ public:
   void UnsetRangeUser(const char* varname, Bool_t leg=kFALSE);
   void UnsetRangeUser(AliDielectronVarManager::ValueTypes type, Bool_t leg=kFALSE);
 
+  // getter functions
+  Int_t GetNSteps() const {return fMainArr->GetEntries(); }
+
   TObjArray* CollectHistos(AliDielectronVarManager::ValueTypes varx,
                           AliDielectronVarManager::ValueTypes vary=AliDielectronVarManager::kNMaxValues,
-                          AliDielectronVarManager::ValueTypes varz=AliDielectronVarManager::kNMaxValues)
-  { return CollectProfiles("hist",varx,vary,varz); }
+                          AliDielectronVarManager::ValueTypes varz=AliDielectronVarManager::kNMaxValues,
+                          AliDielectronVarManager::ValueTypes varw=AliDielectronVarManager::kNMaxValues)
+  { return CollectProfiles("hist",varx,vary,varz,varw); }
+  TObjArray* CollectHistos(TString option,
+                          AliDielectronVarManager::ValueTypes varx,
+                          AliDielectronVarManager::ValueTypes vary=AliDielectronVarManager::kNMaxValues,
+                          AliDielectronVarManager::ValueTypes varz=AliDielectronVarManager::kNMaxValues,
+                          AliDielectronVarManager::ValueTypes varw=AliDielectronVarManager::kNMaxValues)
+  { return CollectProfiles(Form("%s:hist",option.Data()),varx,vary,varz,varw); }
   TObjArray* CollectProfiles(TString option,
                             AliDielectronVarManager::ValueTypes varx,
                             AliDielectronVarManager::ValueTypes vary=AliDielectronVarManager::kNMaxValues,
                             AliDielectronVarManager::ValueTypes varz=AliDielectronVarManager::kNMaxValues,
                             AliDielectronVarManager::ValueTypes vart=AliDielectronVarManager::kNMaxValues);
 
-  TObject* GetObject(const char *step, TObjArray *histArr=0x0);
-  TObject* FindObjects(TObjArray *histos);
-  TObject* Merge(TObjArray *arr);
+  TObjArray* FindObjects(TObjArray *histos);
+  TObjArray* Merge(TObjArray *arr);
 
   void CheckCuts(TObjArray *arr);
   virtual void Print(const Option_t* option ="") const ;