AliCaloPID: Correct matching rejection in case of recalculation in the analysis,...

[u/mrichter/AliRoot.git] / ANALYSIS / AliCollisionNormalizationTask.cxx

diff --git a/ANALYSIS/AliCollisionNormalizationTask.cxx b/ANALYSIS/AliCollisionNormalizationTask.cxx
index bc93c5dae433051e102883929edfca16f6b0051b..0d6a27695a67bb56ba2184ad9703f69332ec20fc 100644 (file)
--- a/ANALYSIS/AliCollisionNormalizationTask.cxx
+++ b/ANALYSIS/AliCollisionNormalizationTask.cxx
@@ -107,6 +107,9 @@ void AliCollisionNormalizationTask::UserExec(Option_t*)
 
   // Get the ESD
   AliESDEvent * aESD = dynamic_cast<AliESDEvent*>(fInputEvent);
+  if(!aESD) {
+    AliFatal("Cannot get ESD");
+  }
   if (strcmp(aESD->ClassName(),"AliESDEvent")) {
     AliFatal("Not processing ESDs");
   }
@@ -122,7 +125,8 @@ void AliCollisionNormalizationTask::UserExec(Option_t*)
   // NB never call IsEventSelected more than once per event
   // (statistics histogram would be altered)
 
-  Bool_t isSelected = ((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected();
+  // FIXME: using only MB events, foresee more events?
+  Bool_t isSelected = (((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected() & AliVEvent::kMB);
 
   // Get the Multiplicity cut
   const AliMultiplicity* mult = aESD->GetMultiplicity();
@@ -191,9 +195,13 @@ Bool_t AliCollisionNormalizationTask::IsEventInBinZero() {
 
   Bool_t isZeroBin = kTRUE;
   const AliESDEvent* esd= dynamic_cast<AliESDEvent*>(fInputEvent);
+  if (!esd){ 
+    Printf("AliCollisionNormalizationTask::IsEventInBinZero: Can't get ESD");
+    return kFALSE;   
+  }
   const AliMultiplicity* mult = esd->GetMultiplicity();
   if (!mult){
-    Printf("AliAnalysisTaskBGvsTime::IsBinZero: Can't get mult object");
+    Printf("AliCollisionNormalizationTask::IsEventInBinZero: Can't get mult object");
     return kFALSE;
   }
   Int_t ntracklet = mult->GetNumberOfTracklets();