X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=ANALYSIS%2FAliPhysicsSelection.h;h=6c6e6223c90c4f2ff2d15fd779ad96e644199358;hb=ecd4e3ba221920c261d127fe16c7c0b8f4e7d7eb;hp=04fe54632fbe6e4583755ab2e106881158cb0d57;hpb=2d45a1a7a11ea8d353e19b9e4612907284602b88;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ANALYSIS/AliPhysicsSelection.h b/ANALYSIS/AliPhysicsSelection.h
index 04fe54632fb..6c6e6223c90 100644
--- a/ANALYSIS/AliPhysicsSelection.h
+++ b/ANALYSIS/AliPhysicsSelection.h
@@ -21,7 +21,7 @@
 #include "TObjString.h"
 #include "AliVEvent.h"
 
-#define VERBOSE_STAT
+//#define VERBOSE_STAT
 
 class AliESDEvent;
 class TH2F;
@@ -36,16 +36,16 @@ class AliPhysicsSelection : public AliAnalysisCuts
 public:
 
 public:
-  enum {kStatTriggerClass=1,kStatHWTrig,kStatV0ABG,kStatV0CBG,kStatMB1,kStatMB1Prime,kStatFMD,kStatFO1,kStatFO2,kStatV0A,kStatV0C,kStatSSD1,kStatFO1AndV0,kStatV0,kStatAny2Hits,kStatOffline,kStatBG,kStatAccepted};
+  enum {kStatTriggerClass=1,kStatHWTrig,kStatV0ABG,kStatV0CBG,kStatMB1,kStatMB1Prime,kStatFMD,kStatFO1,kStatFO2,kStatFO2L1,kStatV0A,kStatV0C,kStatZDCA,kStatZDCC,kStatZDCAC,kStatZDCTime,kStatV0,kStatOffline,kStatBG,kStatAccepted};
 
 #ifdef VERBOSE_STAT
-  enum {kStatRowBG=0,kStatRowAcc,kStatRowBGFrac,kStatRowAccFrac,kStatRowErrGoodFrac,kStatRowGoodFrac,kStatRowErrGood,kStatRowGood}; // offset wrt fBGStatOffset
+  enum {kStatRowAllB=0, kStatRowAllAC, kStatRowAllE, kStatRowBG,kStatRowAcc,kStatRowBGFrac,kStatRowAccFrac,kStatRowErrGoodFrac,kStatRowGoodFrac,kStatRowErrGood,kStatRowGood}; // offset wrt fBGStatOffset
 #else
-  enum {kStatRowBG=0,kStatRowAcc,kStatRowGood}; // offset wrt fBGStatOffset
+  enum {kStatRowAllB=0, kStatRowAllAC, kStatRowAllE, kStatRowBG, kStatRowAcc,kStatRowGood}; // offset wrt fBGStatOffset
 #endif
 
   enum {kStatIdxAll=0,kStatIdxBin0=1};
-
+  enum ETriggerLogic { kCINT1 = 0, kCMBS2A, kCMBS2C, kCMBAC, kCMBACS2, kHighMultL1 };
 
   typedef Bool_t (*Bin0Callback_t)(const AliESDEvent *);
 
@@ -59,17 +59,19 @@ public:
     
   Int_t  GetCurrentRun() const {return fCurrentRun;}
   UInt_t IsCollisionCandidate(const AliESDEvent* aEsd);
-  Bool_t Initialize(Int_t runNumber);
+  Bool_t Initialize(const AliESDEvent* aEsd);
+  Bool_t Initialize(Int_t runNumber, Bool_t pp);
     
   void SetAnalyzeMC(Bool_t flag = kTRUE) { fMC = flag; }
   void SetSkipTriggerClassSelection(Bool_t flag = kTRUE) { fSkipTriggerClassSelection = flag; }
   void SetSkipV0(Bool_t flag=kTRUE) { fSkipV0 = flag;}
+  void SetSkipZDCTime(Bool_t flag=kTRUE) { fSkipZDCTime = flag;}
    
   void AddBackgroundIdentification(AliAnalysisCuts* background) { fBackgroundIdentification = background; }
     
   virtual void Print(Option_t* option = "") const;
   virtual Long64_t Merge(TCollection* list);
-  void SaveHistograms(const char* folder = 0) const;
+  void SaveHistograms(const char* folder = 0);
     
   const TList* GetCollisionTriggerClasses() const { return &fCollTrigClasses; }
   const TList* GetBGTriggerClasses()        const { return &fBGTrigClasses; }
@@ -91,7 +93,7 @@ public:
   void SetBin0CallbackViaPointer( Bin0Callback_t cb) {fBin0CallBackPointer = cb;}// WARNING: THIS SHOULD NOT BE USED, WILL BE REMOVED SOON
   
 protected:
-  UInt_t CheckTriggerClass(const AliESDEvent* aEsd, const char* trigger) const;
+  UInt_t CheckTriggerClass(const AliESDEvent* aEsd, const char* trigger, Int_t& triggerLogic) const;
   Int_t GetTriggerScheme(UInt_t runNumber) const;
   const char * GetBXIDs(UInt_t runNumber, const char * trigger ) ;
   const char * GetFillingScheme(UInt_t runNumber) ;
@@ -114,6 +116,7 @@ protected:
   Bool_t fSkipTriggerClassSelection;  // flag that determines if the trigger classs selection is skipped
   Bool_t fUsingCustomClasses;         // flag that is set if costum trigger classes are defined
   Bool_t fSkipV0;                     // ignore information from v0
+  Bool_t fSkipZDCTime;                     // ignore ZDC timing cut (used in HI)
 
   Float_t fBIFactorA;                 // ratio of interacting over non interacting bunch intensities for beam 1
   Float_t fBIFactorC;                 // ratio of interacting over non interacting bunch intensities for beam 2
@@ -130,7 +133,9 @@ protected:
   TString fBin0CallBack; // callback used to determine if an event is in the bin0 (name of the task where the callback is implemented);
   Bin0Callback_t fBin0CallBackPointer; //! don't stream this. TO BE REMOVED SOON
 
-  ClassDef(AliPhysicsSelection, 10)
+  Bool_t fIsPP; // True if processing pp run, false if heavy ion
+
+  ClassDef(AliPhysicsSelection, 12)
     
     private:
   AliPhysicsSelection(const AliPhysicsSelection&);