Adding support for the fast cluster to the physics selection

diff --git a/ANALYSIS/AliPhysicsSelection.cxx b/ANALYSIS/AliPhysicsSelection.cxx
index 1f99541486b34d92c2d86688fa390338da1feae5..0668fd1b32b490eec9fde6df8611ea9e0d5f0917 100644 (file)
--- a/ANALYSIS/AliPhysicsSelection.cxx
+++ b/ANALYSIS/AliPhysicsSelection.cxx
@@ -253,6 +253,8 @@ UInt_t AliPhysicsSelection::CheckTriggerClass(const AliESDEvent* aEsd, const cha
   UInt_t returnCode = AliVEvent::kUserDefined;
   triggerLogic = kCINT1;
   
+  AliDebug(AliLog::kDebug+1, Form("Processing event with triggers %s", aEsd->GetFiredTriggerClasses().Data()));
+  
   TString str(trigger);
   TObjArray* tokens = str.Tokenize(" ");
   
@@ -286,7 +288,7 @@ UInt_t AliPhysicsSelection::CheckTriggerClass(const AliESDEvent* aEsd, const cha
       
       delete tokens2;
       
-      if (!foundTriggerClass)
+      if (flag && !foundTriggerClass)
       {
         AliDebug(AliLog::kDebug+1, Form("Rejecting event because (none of the) trigger class(es) %s is present", str2.Data()));
         delete tokens;
@@ -870,15 +872,15 @@ Bool_t AliPhysicsSelection::Initialize(Int_t runNumber)
   if(!fPSOADB || !fUsingCustomClasses) { // if it's already set and custom class is required, we use the one provided by the user
     AliInfo("Using Standard OADB");
     AliOADBContainer * psContainer = (AliOADBContainer*) foadb->Get("physSel");
-    if (!psContainer) AliFatal("Cannot fetche OADB container for Physics selection");
-    fPSOADB = (AliOADBPhysicsSelection*) psContainer->GetObject(runNumber, fIsPP ? "DefaultPP" : "DefaultPbPb");
+    if (!psContainer) AliFatal("Cannot fetch OADB container for Physics selection");
+    fPSOADB = (AliOADBPhysicsSelection*) psContainer->GetObject(runNumber, fIsPP ? "oadbDefaultPP" : "oadbDefaultPbPb");
     if (!fPSOADB) AliFatal(Form("Cannot find physics selection object for run %d", runNumber));
   } else {
     AliInfo("Using Custom OADB");
   }
   if(!fFillOADB || !fUsingCustomClasses) { // if it's already set and custom class is required, we use the one provided by the user
     AliOADBContainer * fillContainer = (AliOADBContainer*) foadb->Get("fillScheme");
-    if (!fillContainer) AliFatal("Cannot fetche OADB container for filling scheme");
+    if (!fillContainer) AliFatal("Cannot fetch OADB container for filling scheme");
     fFillOADB = (AliOADBFillingScheme*) fillContainer->GetObject(runNumber, "Default");
     if (!fFillOADB) AliFatal(Form("Cannot find  filling scheme object for run %d", runNumber));
   }

diff --git a/ANALYSIS/macros/BrowseAndFillPhysicsSelectionOADB.C b/ANALYSIS/macros/BrowseAndFillPhysicsSelectionOADB.C
index 0763537f3b4d2f23fc0808487f14d27569494762..a15a9dddd57036e964dbfbf3cc57e23cacc5836c 100644 (file)
--- a/ANALYSIS/macros/BrowseAndFillPhysicsSelectionOADB.C
+++ b/ANALYSIS/macros/BrowseAndFillPhysicsSelectionOADB.C
@@ -43,9 +43,12 @@ void BrowseAndFillPhysicsSelectionOADB(Bool_t fill = kFALSE) {
   oadbDefaultPP->AddCollisionTriggerClass   ( AliVEvent::kMB,"+CINT1-B-NOPF-ALLNOTRD","B",0);
   oadbDefaultPP->AddBGTriggerClass          ( AliVEvent::kMB,"+CINT1-AC-NOPF-ALLNOTRD","AC",0);
   oadbDefaultPP->AddBGTriggerClass          ( AliVEvent::kMB,"+CINT1-E-NOPF-ALLNOTRD","E",0);  
+  oadbDefaultPP->AddCollisionTriggerClass   ( AliVEvent::kMB | AliVEvent::kFastOnly,"+CINT1-B-NOPF-FASTNOTRD -CINT1-B-NOPF-ALLNOTRD","B",0);
+  oadbDefaultPP->AddBGTriggerClass          ( AliVEvent::kMB | AliVEvent::kFastOnly,"+CINT1-AC-NOPF-FASTNOTRD -CINT1-AC-NOPF-ALLNOTRD","AC",0);
+  oadbDefaultPP->AddBGTriggerClass          ( AliVEvent::kMB | AliVEvent::kFastOnly,"+CINT1-E-NOPF-FASTNOTRD -CINT1-E-NOPF-ALLNOTRD","E",0);  
   oadbDefaultPP->SetHardwareTrigger         ( 0,"SPDGFO >= 1 || V0A || V0C");                                        
   oadbDefaultPP->SetOfflineTrigger          ( 0,"(SPDGFO >= 1 || V0A || V0C) && !V0ABG && !V0CBG");
-  
+
   oadbDefaultPP->AddCollisionTriggerClass   ( AliVEvent::kMUON,"+CMUS1-B-NOPF-MUON","B",1);
   oadbDefaultPP->AddBGTriggerClass          ( AliVEvent::kMUON,"+CMUS1-AC-NOPF-MUON","AC",1);
   oadbDefaultPP->AddBGTriggerClass          ( AliVEvent::kMUON,"+CMUS1-E-NOPF-MUON","E",1);

diff --git a/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root b/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root
index 89bb0c7a1496d9b88dbf7450796bc0239c6d89b8..b749f09b24f60c72bf5395e50a04a358cb3985d5 100644 (file)
Binary files a/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root and b/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root differ

diff --git a/STEER/AliVEvent.h b/STEER/AliVEvent.h
index c31366243ed8e3c45ab3d58f87cdc2c0c89b772e..147a5321dc3f4a7488a71892c407b552169281d4 100644 (file)
--- a/STEER/AliVEvent.h
+++ b/STEER/AliVEvent.h
@@ -35,6 +35,7 @@ public:
       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
+      kFastOnly     = BIT(30), // The fast cluster fired. This bit is set in to addition another trigger bit, e.g. kMB
       kUserDefined  = BIT(31), // Set when custom trigger classes are set in AliPhysicsSelection, offline SPD or V0 selection
       kAny          = 0xffffffff // to accept any trigger
   };