revert changes

[u/mrichter/AliRoot.git] / PWG0 / AliPWG0Helper.h

diff --git a/PWG0/AliPWG0Helper.h b/PWG0/AliPWG0Helper.h
index d3aaf39531fcb9ac8e0e11c065f49259935666a3..763bba3d486810db8cdd5408b8720b4bb442bda1 100644 (file)
--- a/PWG0/AliPWG0Helper.h
+++ b/PWG0/AliPWG0Helper.h
@@ -4,10 +4,10 @@
 #define ALIPWG0HELPER_H
 
 #include <TObject.h>
+#include <AliTriggerAnalysis.h>
 
 // static helper functions
 
-class AliESD;
 class AliESDEvent;
 class AliESDVertex;
 class TParticle;
@@ -18,20 +18,18 @@ class AliHeader;
 class AliGenEventHeader;
 class AliStack;
 class TTree;
+class AliOfflineTrigger;
 
 class AliPWG0Helper : public TObject
 {
   public:
-    enum Trigger { kMB1 = 0, kMB2, kSPDFASTOR }; // definition from ALICE-INT-2005-025
-    enum AnalysisMode { kInvalid = -1, kSPD = 0, kTPC, kTPCITS };
+    enum AnalysisMode { kInvalid = -1, kSPD = 0x1, kTPC = 0x2, kTPCITS = 0x4, kFieldOn = 0x8, kSPDOnlyL0 = 0x10 };
     // in case we want to use bitmaps...
     enum MCProcessType { kInvalidProcess = -1, kND = 0x1, kDD = 0x2, kSD = 0x4 };
 
-    static Bool_t IsEventTriggered(const AliESD* aEsd, Trigger trigger = kMB2);
-    static Bool_t IsEventTriggered(ULong64_t triggerMask, Trigger trigger = kMB2);
-    static const AliESDVertex* GetVertex(AliESDEvent* aEsd, AnalysisMode analysisMethod, Bool_t debug = kFALSE,Bool_t bRedoTPC = false);
+    static const AliESDVertex* GetVertex(AliESDEvent* aEsd, AnalysisMode analysisMethod, Bool_t debug = kFALSE);
     static Bool_t TestVertex(const AliESDVertex* vertex, AnalysisMode analysisMode, Bool_t debug = kFALSE);
-
+    
     static Bool_t IsPrimaryCharged(TParticle* aParticle, Int_t aTotalPrimaries, Bool_t adebug = kFALSE);
 
     static AliPWG0Helper::MCProcessType GetEventProcessType(AliHeader* aHeader, Bool_t adebug = kFALSE);
@@ -49,10 +47,10 @@ class AliPWG0Helper : public TObject
     static void NormalizeToBinWidth(TH1* hist);
     static void NormalizeToBinWidth(TH2* hist);
 
-    static void PrintConf(AnalysisMode analysisMode, Trigger trigger);
-
+    static void PrintConf(AnalysisMode analysisMode, AliTriggerAnalysis::Trigger trigger);
+    
   protected:
-    static Int_t fgLastProcessType;    // stores the raw value of the last process type extracnted
+    static Int_t fgLastProcessType;    // stores the raw value of the last process type extracted
  
     ClassDef(AliPWG0Helper, 0)