Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / ANALYSIS / AliPhysicsSelection.h

diff --git a/ANALYSIS/AliPhysicsSelection.h b/ANALYSIS/AliPhysicsSelection.h
index 474b59a2777cfc7658ca7e2b6ed6e013c5790d83..da254272459283a24628eeb97e17bef1e66007af 100644 (file)
--- a/ANALYSIS/AliPhysicsSelection.h
+++ b/ANALYSIS/AliPhysicsSelection.h
@@ -20,6 +20,7 @@
 #include <TList.h>
 #include "TObjString.h"
 #include "AliVEvent.h"
+#include "AliLog.h"
 #include "AliAnalysisManager.h"
 
 //#define VERBOSE_STAT
@@ -40,7 +41,7 @@ class AliPhysicsSelection : public AliAnalysisCuts
 public:
 
 public:
-  enum {kStatTriggerClass=1,kStatHWTrig,kStatV0ABG,kStatV0CBG,kStatMB1,kStatMB1Prime,kStatLaserCut,kStatFO1,kStatFO2,kStatFO2L1,kStatV0A,kStatV0C,kStatZDCA,kStatZDCC,kStatZDCAC,kStatZDCTime,kStatV0,kStatOffline,kStatBG,kStatAccepted};
+  enum {kStatTriggerClass=1,kStatHWTrig,kStatV0ABG,kStatV0CBG,kStatMB1,kStatMB1Prime,kStatLaserCut,kHVdipCut,kStatFO1,kStatFO2,kStatFO2L1,kStatV0A,kStatV0C, kStatT0BB, kStatT0BG, kStatT0PileUp, kStatZDCA,kStatZDCC,kStatZDCAC,kStatZDCTime,kStatZNABG,kStatZNCBG,kStatV0,kStatV0ZN,kStatOffline,kStatBG, kStatAcceptedPileUp, kStatAccepted};
 
 #ifdef VERBOSE_STAT
   enum {kStatRowAllB=0, kStatRowAllAC, kStatRowAllE, kStatRowBG,kStatRowAcc,kStatRowBGFrac,kStatRowAccFrac,kStatRowErrGoodFrac,kStatRowGoodFrac,kStatRowErrGood,kStatRowGood}; // offset wrt fBGStatOffset
@@ -68,10 +69,9 @@ public:
     
   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 SetSkipV0(Bool_t flag=kTRUE) { AliError ("This method is deprecated! Please change the OADB configuration instead") ; fSkipV0 = flag;}
    
-  void AddBackgroundIdentification(AliAnalysisCuts* background) { fBackgroundIdentification = background; }
+  void AddBackgroundIdentification(AliAnalysisCuts*) { AliFatal ("This method is deprecated. Please use the kSPDClsVsTrkBG tag in the OADB configuration instead"); }
     
   virtual void Print(const Option_t* option = "") const;
   virtual Long64_t Merge(TCollection* list);
@@ -86,7 +86,7 @@ public:
   const AliOADBFillingScheme    * GetOADBFillingScheme()    const {return fFillOADB;}
   const AliOADBTriggerAnalysis  * GetOADBTriggerAnalysis()  const {return fTriggerOADB;}
 
-  const Int_t GetBGStatOffset() const { return fBGStatOffset; }
+  Int_t GetBGStatOffset() const { return fBGStatOffset; }
 
 
   AliTriggerAnalysis* GetTriggerAnalysis(Int_t i = 0) { return (fTriggerAnalysis.GetEntries() > 0) ? (AliTriggerAnalysis*) fTriggerAnalysis.At(i) : 0; }    
@@ -105,6 +105,9 @@ public:
   
   static const char * GetOADBFileName() {   static TString filename; filename.Form("%s/COMMON/PHYSICSSELECTION/data/physicsSelection.root", AliAnalysisManager::GetOADBPath()); return filename.Data();};
 
+  void SetPassName(const TString passName) { fPassName = passName; }
+  void DetectPassName();
+  Bool_t IsMC() const { return fMC; }
 protected:
   UInt_t CheckTriggerClass(const AliESDEvent* aEsd, const char* trigger, Int_t& triggerLogic) const;
   Bool_t EvaluateTriggerLogic(const AliESDEvent* aEsd, AliTriggerAnalysis* triggerAnalysis, const char* triggerLogic, Bool_t offline);
@@ -112,25 +115,22 @@ protected:
   Int_t GetStatRow(const char * triggerBXClass, UInt_t offlineTriggerType, UInt_t ** rowIDs) const;
   const char * GetTriggerString(TObjString * obj);
 
-
+  TString fPassName;      // pass name for current run
   Int_t fCurrentRun;      // run number for which the object is initialized
   Bool_t fMC;             // flag if MC is analyzed
   TList fCollTrigClasses; // trigger class identifying collision candidates
   TList fBGTrigClasses;   // trigger classes identifying background events
     
   TList fTriggerAnalysis; // list of offline trigger objects (several are needed to keep the control histograms separate per trigger class)
-  
-  AliAnalysisCuts* fBackgroundIdentification; // class that performs additional background identification
-    
+      
   TH2F* fHistStatistics[2];      // how many events are cut away why {all,bin 0}
   //  TH2F* fHistStatisticsTokens;   // how many events are cut away why (new version, bins for all tokens. Only used tokens are filled)
   TH2F* fHistBunchCrossing;   // histograms of accepted bunch crossing numbers
   TH1F* fHistTriggerPattern;  // Pattern of the individual detectors in the MB1 trigger. Can reveal inconsistencies/inefficiencies in the trigger 
     
-  Bool_t fSkipTriggerClassSelection;  // flag that determines if the trigger classs selection is skipped
+  Bool_t fSkipTriggerClassSelection;  // flag that determines if the trigger class 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
@@ -156,7 +156,7 @@ protected:
   TPRegexp* fRegexp; //! regular expression for trigger tokens
   TList* fCashedTokens; //! trigger token lookup list
 
-  ClassDef(AliPhysicsSelection, 14)
+  ClassDef(AliPhysicsSelection, 16)
     
     private:
   AliPhysicsSelection(const AliPhysicsSelection&);