Improving event printout

[u/mrichter/AliRoot.git] / STEER / AliRecoParam.cxx

diff --git a/STEER/AliRecoParam.cxx b/STEER/AliRecoParam.cxx
index 0d988d7cf76088c2b17147f162fe020e91e93460..8c89652b142908bb443b8a9150d5b9b02994cc02 100644 (file)
--- a/STEER/AliRecoParam.cxx
+++ b/STEER/AliRecoParam.cxx
@@ -39,7 +39,7 @@
 
 ClassImp(AliRecoParam)
 
-TString AliRecoParam::fkgEventSpecieName[] = {"Default", "LowMultiplicity", "HighMultiplicity", "Cosmic", "Calibration", "Unknown"} ; 
+TString AliRecoParam::fkgEventSpecieName[] = {"Default", "LowMultiplicity", "HighMultiplicity", "Cosmic", "Calib", "Unknown"} ; 
 
 AliRecoParam::AliRecoParam(): 
   TObject(),
@@ -204,20 +204,27 @@ void AliRecoParam::SetEventSpecie(const AliRunInfo *runInfo, const AliEventInfo
     return;
   }
 
-  if (strcmp(runInfo->GetLHCState(),"STABLE_BEAMS") == 0) {
-    // In case of stable beams
-    if ((strcmp(runInfo->GetBeamType(),"A-A") == 0) ||
+  // Special DAQ events considered as calibration events
+  if (evInfo.GetEventType() != 7) {
+    // START_OF_*, END_OF_*, CALIBRATION etc events
+    fEventSpecie = kCalib;
+    return;
+  }
+
+    if ((strcmp(runInfo->GetLHCState(),"STABLE_BEAMS") == 0) &&
+       ((strcmp(runInfo->GetBeamType(),"A-A") == 0) ||
        (strcmp(runInfo->GetBeamType(),"A-") == 0) ||
-       (strcmp(runInfo->GetBeamType(),"-A") == 0)) {
-      // Heavy ion run (any beam tha is not pp, the event specie is set to kHighMult
+       (strcmp(runInfo->GetBeamType(),"-A") == 0))) {
+      // Heavy ion run (any beam that is not pp, the event specie is set to kHighMult
       fEventSpecie = kHighMult;
     }
-    else if ((strcmp(runInfo->GetBeamType(),"p-p") == 0) ||
-            (strcmp(runInfo->GetBeamType(),"p-") == 0) ||
-            (strcmp(runInfo->GetBeamType(),"-p") == 0) ||
-            (strcmp(runInfo->GetBeamType(),"P-P") == 0) ||
-            (strcmp(runInfo->GetBeamType(),"P-") == 0) ||
-            (strcmp(runInfo->GetBeamType(),"-P") == 0)) {
+    else if ((strcmp(runInfo->GetLHCState(),"STABLE_BEAMS") == 0) &&
+            ((strcmp(runInfo->GetBeamType(),"p-p") == 0) ||
+             (strcmp(runInfo->GetBeamType(),"p-") == 0) ||
+             (strcmp(runInfo->GetBeamType(),"-p") == 0) ||
+             (strcmp(runInfo->GetBeamType(),"P-P") == 0) ||
+             (strcmp(runInfo->GetBeamType(),"P-") == 0) ||
+             (strcmp(runInfo->GetBeamType(),"-P") == 0))) {
       // Proton run, the event specie is set to kLowMult
       fEventSpecie = kLowMult;
     }
@@ -225,22 +232,10 @@ void AliRecoParam::SetEventSpecie(const AliRunInfo *runInfo, const AliEventInfo
       // No beams, we assume cosmic data
       fEventSpecie = kCosmic;
     }
-    else if (strcmp(runInfo->GetBeamType(),"UNKNOWN") == 0) {
-      // No LHC beam information is available, we the default
-      // event specie
-      fEventSpecie = kDefault;
-    }
 
     // Now we look into the trigger type in order to decide
     // on the remaining cases (cosmic event within LHC run,
-    // calibration, for example TPC laser, triggers within physics run,
-    // special DAQ events considered as calibration etc...)
-    if (evInfo.GetEventType() != 7) {
-      // START_OF_*, END_OF_*, CALIBRATION etc events
-      fEventSpecie = kCalib;
-      return;
-    }
-
+    // calibration, for example TPC laser, triggers within physics run
     TString triggerClasses = evInfo.GetTriggerClasses();
     TObjArray* trClassArray = triggerClasses.Tokenize(" ");
     Int_t nTrClasses = trClassArray->GetEntriesFast();
@@ -263,6 +258,7 @@ void AliRecoParam::SetEventSpecie(const AliRunInfo *runInfo, const AliEventInfo
          cosmicTrigger = kTRUE;
          AliDebug(1,Form("Trigger %s identified as cosmic according to the list defined in OCDB.",
                          trClass.Data()));
+         continue;
        }
       }
       else {
@@ -283,7 +279,6 @@ void AliRecoParam::SetEventSpecie(const AliRunInfo *runInfo, const AliEventInfo
 
     // Here we have to add if we have other cases
     // and also HLT info if any...
-  }
 }
 
 const AliDetectorRecoParam *AliRecoParam::GetDetRecoParam(Int_t iDet) const