]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Coverity fix and changes to data processing
authorcnattras <cnattras@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 5 Apr 2012 01:49:03 +0000 (01:49 +0000)
committercnattras <cnattras@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 5 Apr 2012 01:49:03 +0000 (01:49 +0000)
PWGLF/totEt/AliAnalysisTaskHadEt.cxx

index 5afbf432f0fafbefdeb4e1d3b3ab7210d074375b..faa99b83235c16702d61a5dbe789550b2a9e77ed 100644 (file)
@@ -172,23 +172,22 @@ Int_t res = CheckPhysicsSelection(fESDEvent->GetRunNumber()); // Check if the ph
 
 AliCentrality *cent = GetCentralityObject();
 
-if(res == 0 && cent){
+//if(res == 0 && cent){
+//if(cent){
   
-  //cout<<"New Event"<<endl;  
-
-  AliMCEvent* mcEvent = MCEvent();
-  if(!mcEvent && fIsSim){  
-    AliFatal("ERROR: MC Event does not exist");
-    return;
+  Int_t eventtype =    AliPWG0Helper::kInvalidProcess;
+  if(!fIsSim){
+    fRecAnalysis->AnalyseEvent(fESDEvent,eventtype);
   }
-  Int_t eventtype = (Int_t) AliPWG0Helper::GetEventProcessType(mcEvent->Header());
-  fRecAnalysis->AnalyseEvent(fESDEvent,eventtype);
-
-// if (!mcEvent) {
-//   Printf("ERROR: Could not retrieve MC event");
-//  }
-  if (mcEvent && fESDEvent && fIsSim){
-    ((AliAnalysisHadEtMonteCarlo*)fMCAnalysis)->AnalyseEvent((AliVEvent*)mcEvent,(AliVEvent*)fESDEvent);
+  else{
+    AliMCEvent* mcEvent = MCEvent();
+    if(!mcEvent){  
+      AliFatal("ERROR: MC Event does not exist");
+      return;
+    }
+    eventtype = (Int_t) AliPWG0Helper::GetEventProcessType(mcEvent->Header());
+    if (fESDEvent){
+      ((AliAnalysisHadEtMonteCarlo*)fMCAnalysis)->AnalyseEvent((AliVEvent*)mcEvent,(AliVEvent*)fESDEvent);
 
     if(AliPWG0Helper::GetEventProcessType(mcEvent->Header()) == AliPWG0Helper::kND || fRecAnalysis->DataSet()==20100){//either non-diffractive or Pb+Pb
       if(fMCAnalysis->Full()){
@@ -243,7 +242,8 @@ if(res == 0 && cent){
       }
     }
   }
- }
+  }
+  //}
 //cout<<"End Event"<<endl<<endl;
 // Post output data.
  PostData(1, fOutputList);