Reverting changes from AliZDCQADataMakerRec.cxx

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

diff --git a/PWG0/AliPWG0Helper.cxx b/PWG0/AliPWG0Helper.cxx
index ef7f85910b28b6a94e526a6e0591a8298df56017..66ff63255ed5fa4e639a7392432bfc93e2a09e49 100644 (file)
--- a/PWG0/AliPWG0Helper.cxx
+++ b/PWG0/AliPWG0Helper.cxx
@@ -14,7 +14,6 @@
 
 #include <AliHeader.h>
 #include <AliStack.h>
-#include <AliLog.h>
 
 #include <AliLog.h>
 #include <AliESD.h>
@@ -34,137 +33,17 @@ ClassImp(AliPWG0Helper)
 
 Int_t AliPWG0Helper::fgLastProcessType = -1;
 
-//____________________________________________________________________
-Bool_t AliPWG0Helper::IsEventTriggered(const AliESDEvent* aEsd, Trigger trigger)
-{
-  // checks if an event has been triggered
-  // this function implements the "offline" methods that use the ESD, other trigger requests are passed to the function prototype with ULong_t
-
-  Int_t firedChips = 0;
-  Bool_t v0A = kFALSE;
-  Bool_t v0C = kFALSE;
-
-  // offline triggers have to be dealt with here, because we need the esd pointer
-  if (trigger == kOfflineFASTOR || trigger == kOfflineMB1 || trigger == kOfflineMB2 || trigger == kOfflineMB3)
-  {
-      const AliMultiplicity* mult = aEsd->GetMultiplicity();
-      if (!mult)
-      {
-        Printf("AliPWG0Helper::IsEventTriggered: ERROR: AliMultiplicity not available");
-        return kFALSE;
-      }
-      firedChips = mult->GetNumberOfFiredChips(0) + mult->GetNumberOfFiredChips(1);
-  }
-  if (trigger == kOfflineMB1 || trigger == kOfflineMB2 || trigger == kOfflineMB3)
-  {
-    AliESDVZERO* v0Data = aEsd->GetVZEROData();
-    if (!v0Data)
-    {
-      Printf("AliPWG0Helper::IsEventTriggered: ERROR: AliESDVZERO not available");
-      return kFALSE;
-    }
-    for (Int_t i=0; i<32; i++)
-    {
-      if (v0Data->BBTriggerV0A(i))
-        v0A = kTRUE;
-      if (v0Data->BBTriggerV0C(i))
-        v0C = kTRUE;
-    }
-  }
-      
-  switch (trigger)
-  {
-    case kOfflineFASTOR:
-    {
-      if (firedChips > 0)
-        return kTRUE;
-      break;
-    }
-    case kOfflineMB1:
-    {
-      if ((firedChips > 0) || v0A || v0C)
-        return kTRUE;
-      break;
-    }
-    case kOfflineMB2:
-    {
-      if ((firedChips > 0) && (v0A || v0C))
-        return kTRUE;
-      break;
-    }
-    case kOfflineMB3:
-    {
-      if ((firedChips > 0) && v0A && v0C)
-        return kTRUE;
-      break;
-    }
-    default:
-    {
-      return IsEventTriggered(aEsd->GetTriggerMask(), trigger);
-      break;
-    }
-  }
-  
-  return kFALSE;
-}
-
-//____________________________________________________________________
-Bool_t AliPWG0Helper::IsEventTriggered(ULong64_t triggerMask, Trigger trigger)
-{
-  // check if the event was triggered
-  //
-  // this function needs the branch fTriggerMask
-  
-  // definitions from p-p.cfg
-  ULong64_t spdFO = (1 << 14);
-  ULong64_t v0left = (1 << 10);
-  ULong64_t v0right = (1 << 11);
-
-  switch (trigger)
-  {
-    case kMB1:
-    {
-      if (triggerMask & spdFO || ((triggerMask & v0left) || (triggerMask & v0right)))
-        return kTRUE;
-      break;
-    }
-    case kMB2:
-    {
-      if (triggerMask & spdFO && ((triggerMask & v0left) || (triggerMask & v0right)))
-        return kTRUE;
-      break;
-    }
-    case kMB3:
-    {
-      if (triggerMask & spdFO && (triggerMask & v0left) && (triggerMask & v0right))
-        return kTRUE;
-      break;
-    }
-    case kSPDFASTOR:
-    {
-      if (triggerMask & spdFO)
-        return kTRUE;
-      break;
-    }
-    default:
-      Printf("IsEventTriggered: ERROR: Trigger type %d not implemented in this method", (Int_t) trigger);
-      break;
-  }
-
-  return kFALSE;
-}
-
 //____________________________________________________________________
 Bool_t AliPWG0Helper::TestVertex(const AliESDVertex* vertex, AnalysisMode analysisMode, Bool_t debug)
 {
     // Checks if a vertex meets the needed quality criteria
 
   Float_t requiredZResolution = -1;
-  if (analysisMode == kSPD || analysisMode == kTPCITS)
+  if (analysisMode & kSPD || analysisMode & kTPCITS)
   {
     requiredZResolution = 0.1;
   }
-  else if (analysisMode == kTPC)
+  else if (analysisMode & kTPC)
     requiredZResolution = 10.;
 
   // check resolution
@@ -188,13 +67,13 @@ const AliESDVertex* AliPWG0Helper::GetVertex(AliESDEvent* aEsd, AnalysisMode ana
   // also the quality criteria that are applied)
 
   const AliESDVertex* vertex = 0;
-  if (analysisMode == kSPD || analysisMode == kTPCITS)
+  if (analysisMode & kSPD || analysisMode & kTPCITS)
   {
     vertex = aEsd->GetPrimaryVertexSPD();
     if (debug)
       Printf("AliPWG0Helper::GetVertex: Returning SPD vertex");
   }
-  else if (analysisMode == kTPC)
+  else if (analysisMode & kTPC)
   {
     if(bRedoTPC){
       if (debug)
@@ -625,37 +504,33 @@ void AliPWG0Helper::NormalizeToBinWidth(TH2* hist)
 }
 
 //____________________________________________________________________
-void AliPWG0Helper::PrintConf(AnalysisMode analysisMode, Trigger trigger)
+void AliPWG0Helper::PrintConf(AnalysisMode analysisMode, AliTriggerAnalysis::Trigger trigger)
 {
   //
   // Prints the given configuration
   //
 
-  TString str(">>>> Running with ");
+  TString str(">>>> Running with >");
 
-  switch (analysisMode)
-  {
-    case kInvalid: str += "invalid setting"; break;
-    case kSPD : str += "SPD-only"; break;
-    case kTPC : str += "TPC-only"; break;
-    case kTPCITS : str += "Global tracking"; break;
-  }
-
-  str += " and trigger ";
+  if (analysisMode & kSPD)
+    str += "SPD-only";
+    
+  if (analysisMode & kTPC)
+     str += "TPC-only";
+    
+  if (analysisMode & kTPCITS)
+     str += "Global tracking";
 
-  switch (trigger)
+  if (analysisMode & kFieldOn)
   {
-    case kMB1 : str += "MB1"; break;
-    case kMB2 : str += "MB2"; break;
-    case kMB3 : str += "MB3"; break;
-    case kSPDFASTOR : str += "SPD FASTOR"; break;
-    case kOfflineMB1 : str += "Offline MB1"; break;
-    case kOfflineMB2 : str += "Offline MB2"; break;
-    case kOfflineMB3 : str += "Offline MB3"; break;
-    case kOfflineFASTOR : str += "Offline SPD FASTOR"; break;
+     str += " (with field)";
   }
-
-  str += " <<<<";
+  else
+     str += " (WITHOUT field)";
+  
+  str += "< and trigger >";
+  str += AliTriggerAnalysis::GetTriggerName(trigger);
+  str += "< <<<<";
 
   Printf("%s", str.Data());
 }