new offline trigger bits for 2011 PbPb run

new tokens for V0 central and semicentral trigger (Cvetan)

diff --git a/ANALYSIS/AliTriggerAnalysis.cxx b/ANALYSIS/AliTriggerAnalysis.cxx
index 74e5cb8c1fdb65562d023f8945b5f7c1df56968e..5eac4f6db98fd70d50dc12a0a2ed3bd98174e6f3 100644 (file)
--- a/ANALYSIS/AliTriggerAnalysis.cxx
+++ b/ANALYSIS/AliTriggerAnalysis.cxx
@@ -248,6 +248,8 @@ const char* AliTriggerAnalysis::GetTriggerName(Trigger trigger)
     case kZDCTDCA : str = "ZDC TDC A"; break;
     case kZDCTDCC : str = "ZDC TDC C"; break;
     case kZDCTime : str = "ZDC Time Cut"; break;
+    case kCentral : str = "V0 Central"; break;
+    case kSemiCentral : str = "V0 Semi-central"; break;
     default: str = ""; break;
   }
    
@@ -475,6 +477,34 @@ Int_t AliTriggerAnalysis::EvaluateTrigger(const AliESDEvent* aEsd, Trigger trigg
         AliFatal(Form("Online trigger not available for trigger %d", triggerNoFlags));
       return IsLaserWarmUpTPCEvent(aEsd);
     }
+    case kCentral:
+    {
+      if (offline)
+        AliFatal(Form("Offline trigger not available for trigger %d - use centrality selection", triggerNoFlags));
+      if (aEsd->GetVZEROData()) {
+       if (aEsd->GetVZEROData()->TestBit(AliESDVZERO::kTriggerChargeBitsFilled)) {
+         if (aEsd->GetVZEROData()->GetTriggerBits() & (1<<AliESDVZERO::kCTA2andCTC2))
+           decision = kTRUE;
+       }
+       else
+         AliWarning("V0 centrality trigger bits were not filled!");
+      }
+      break;
+    }
+    case kSemiCentral:
+    {
+      if (offline)
+        AliFatal(Form("Offline trigger not available for trigger %d - use centrality selection", triggerNoFlags));
+      if (aEsd->GetVZEROData()) {
+       if (aEsd->GetVZEROData()->TestBit(AliESDVZERO::kTriggerChargeBitsFilled)) {
+         if (aEsd->GetVZEROData()->GetTriggerBits() & (1<<AliESDVZERO::kCTA1andCTC1))
+           decision = kTRUE;
+       }
+       else
+         AliWarning("V0 centrality trigger bits were not filled!");
+      }
+      break;
+    }
     default:
     {
       AliFatal(Form("Trigger type %d not implemented", triggerNoFlags));

diff --git a/ANALYSIS/AliTriggerAnalysis.h b/ANALYSIS/AliTriggerAnalysis.h
index 824428384135b7ab57d3eae35f5c9eae5d3eb467..6e6c26cdc9395b16d6a2002060ed06bfc9ef6cfe 100644 (file)
--- a/ANALYSIS/AliTriggerAnalysis.h
+++ b/ANALYSIS/AliTriggerAnalysis.h
@@ -28,6 +28,7 @@ class AliTriggerAnalysis : public TObject
     enum Trigger { kAcceptAll = 1, kMB1 = 2, kMB2, kMB3, kSPDGFO, kSPDGFOBits, kV0A, kV0C, kV0OR, kV0AND, 
                   kV0ABG, kV0CBG, kZDC, kZDCA, kZDCC, kFMDA, kFMDC, kFPANY, kNSD1, kMB1Prime, 
                   kSPDGFOL0, kSPDGFOL1, kZDCTDCA, kZDCTDCC, kZDCTime, kCTPV0A, kCTPV0C, kTPCLaserWarmUp, kSPDClsVsTrkBG,
+                  kCentral,kSemiCentral,
                   kStartOfFlags = 0x0100, kOfflineFlag = 0x8000, kOneParticle = 0x10000, kOneTrack = 0x20000}; // MB1, MB2, MB3 definition from ALICE-INT-2005-025
     enum AliceSide { kASide = 1, kCSide, kCentralBarrel };
     enum V0Decision { kV0Invalid = -1, kV0Empty = 0, kV0BB, kV0BG, kV0Fake };

diff --git a/STEER/STEERBase/AliVEvent.h b/STEER/STEERBase/AliVEvent.h
index 7584b5f013c6e9537720a090f6121ea14efc18a5..d086d6101c1737c44b97fd32217c56c1b233fa1b 100644 (file)
--- a/STEER/STEERBase/AliVEvent.h
+++ b/STEER/STEERBase/AliVEvent.h
@@ -33,22 +33,29 @@ class AliVEvent : public TObject {
 public:
   enum EOfflineTriggerTypes { 
       kMB           = BIT(0), // Minimum bias trigger, i.e. interaction trigger, offline SPD or V0 selection
-                              // empty slot
       kINT7         = BIT(1), // V0AND trigger, offline V0 selection
       kMUON         = BIT(2), // Muon trigger, offline SPD or V0 selection
       kHighMult     = BIT(3), // High-multiplicity trigger (threshold defined online), offline SPD or V0 selection
       kEMC1         = BIT(4), // EMCAL trigger
       kCINT5        = BIT(5), // Minimum bias trigger without SPD. i.e. interaction trigger, offline V0 selection
       kCMUS5        = BIT(6), // Muon trigger, offline V0 selection
+      kMUSPB        = BIT(6), // idem for PbPb
       kMUSH7        = BIT(7), // Muon trigger: high pt, single muon, offline V0 selection, CINT7 suite
+      kMUSHPB       = BIT(7), // idem for PbPb
       kMUL7         = BIT(8), // Muon trigger: like sign dimuon, offline V0 selection, CINT7 suite
+      kMuonLikePB   = BIT(8), // idem for PbPb
       kMUU7         = BIT(9), // Muon trigger, unlike sign dimuon, offline V0 selection, CINT7 suite
+      kMuonUnlikePB = BIT(9), // idem for PbPb
       kEMC7         = BIT(10), // EMCAL trigger, CINT7 suite
       kMUS7         = BIT(11), // Muon trigger: low pt, single muon, offline V0 selection, CINT7 suite
       kPHI1         = BIT(12), // PHOS trigger, CINT1 suite
       kPHI7         = BIT(13), // PHOS trigger, CINT7 suite
+      kEMCEJE       = BIT(14), // EMCAL jet patch trigger
+      kEMCEGA       = BIT(15), // EMCAL gamma trigger
+      kCentral      = BIT(16), // PbPb central collision trigger
+      kSemiCentral  = BIT(17), // PbPb semicentral collision trigger
       kUserDefined  = BIT(27), // Set when custom trigger classes are set in AliPhysicsSelection, offline SPD or V0 selection
-      // Bits 28 and abovr are served for FLAGS
+      // Bits 28 and above are reserved for FLAGS
       kFastOnly     = BIT(30), // The fast cluster fired. This bit is set in to addition another trigger bit, e.g. kMB
       kAny          = 0xffffffff, // to accept any trigger
       kAnyINT       = kMB | kINT7 | kCINT5 // to accept any interaction (aka minimum bias) trigger

diff --git a/STEER/STEERBase/AliVVZERO.h b/STEER/STEERBase/AliVVZERO.h
index 48a0c65b79fb47f3f5c6c84ffbab2c60903b022c..f4daf2c5a582e4a4c7877c98bd06aa255b8096a8 100644 (file)
--- a/STEER/STEERBase/AliVVZERO.h
+++ b/STEER/STEERBase/AliVVZERO.h
@@ -28,6 +28,24 @@ public:
     kTriggerChargeBitsFilled = BIT(20)
   };
   enum Decision { kV0Invalid = -1, kV0Empty = 0, kV0BB, kV0BG, kV0Fake };
+  enum TriggerBits {
+    kBBAandBBC = 0,
+    kBBAorBBC = 1,
+    kBGAandBBC = 2,
+    kBGA = 3,
+    kBGCandBBA = 4,
+    kBGC = 5,
+    kCTA1andCTC1 = 6,
+    kCTA1orCTC1 = 7,
+    kCTA2andCTC2 = 8,
+    kCTA2orCTC2 = 9,
+    kMTAandMTC = 10,
+    kMTAorMTC = 11,
+    kBBA = 12,
+    kBBC = 13,
+    kBGAorBGC = 14,
+    kBGAandBBCorBGCandBBA = 15
+  };
 
   virtual Short_t  GetNbPMV0A() const = 0;
   virtual Short_t  GetNbPMV0C() const = 0;