Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGGA / PHOSTasks / PHOS_embedding / AliAnalysisTaskPi0DiffEfficiency.cxx

diff --git a/PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx b/PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx
index 3b06c4ca514692e148ec82ba39e6aaee07731e49..2d427903b34f52ffb58113621368b499b93c9e80 100644 (file)
--- a/PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx
+++ b/PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx
@@ -74,7 +74,7 @@ AliAnalysisTaskPi0DiffEfficiency::AliAnalysisTaskPi0DiffEfficiency()
       for(Int_t k=0;k<11;k++)
         fPHOSEvents[i][j][k]=0 ;
   }
-    
+  for(Int_t mod=0; mod<6; mod++) fPHOSBadMap[mod]=0x0 ;
 }
 
 //________________________________________________________________________
@@ -150,6 +150,7 @@ AliAnalysisTaskSE(a),
   fPHOSGeo(0),
   fEventCounter(0)
 { // not implemented
+  for(Int_t mod=0; mod<6; mod++) fPHOSBadMap[mod]=0x0 ;
 }
 //________________________________________________________________________
 void AliAnalysisTaskPi0DiffEfficiency::UserCreateOutputObjects()
@@ -713,7 +714,8 @@ void AliAnalysisTaskPi0DiffEfficiency::UserExec(Option_t *)
   }
   
   FillHistogram("hSelEvents",1.5) ;
-  AliAODHeader *header = event->GetHeader() ;
+  AliAODHeader *header = dynamic_cast<AliAODHeader*>(event->GetHeader()) ;
+  if(!header) AliFatal("Not a standard AOD");
   
   // Checks if we have a primary vertex
   // Get primary vertices form ESD
@@ -1883,6 +1885,7 @@ Double_t AliAnalysisTaskPi0DiffEfficiency::TestCPV(Double_t dx, Double_t dz, Dou
               6.58365e-01*5.91917e-01*5.91917e-01/((pt-9.61306e-01)*(pt-9.61306e-01)+5.91917e-01*5.91917e-01)+1.59219);
   Double_t sz=TMath::Min(2.75,4.90341e+02*1.91456e-02*1.91456e-02/(pt*pt+1.91456e-02*1.91456e-02)+1.60) ;
   AliAODEvent *event = dynamic_cast<AliAODEvent*>(InputEvent());
+  if(!event)AliFatal("Can not get ESD event") ;
   Double_t mf = event->GetMagneticField(); //Positive for ++ and negative for --
 
   if(mf<0.){ //field --