New analysis tag v5-04-40-AN

sevdokim · Mar 18, 2013 · 09543fa · 09543fa
2 parents 4be1811 + 9f7e029
commit 09543fa
Show file tree

Hide file tree

Showing 32 changed files with 1,485 additions and 286 deletions.
diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
@@ -312,7 +312,7 @@ Int_t AliAnalysisManager::GetEntry(Long64_t entry, Int_t getall)
    fCurrentEntry = entry;
    if (!fAutoBranchHandling)
      return 123456789;
-   if (!fTree) return -1; 
+   if (!fTree || !fTree->GetTree()) return -1;
    fIOTimer->Start(kTRUE); 
    Long64_t readbytes = fTree->GetTree()->GetEntry(entry, getall);
    fIOTimer->Stop();

diff --git a/ANALYSIS/AliCentralitySelectionTask.cxx b/ANALYSIS/AliCentralitySelectionTask.cxx
@@ -1421,6 +1421,7 @@ void AliCentralitySelectionTask::UserExec(Option_t */*option*/)
 	TList* headers = ((AliGenCocktailEventHeader*)mcGenH)->GetHeaders();
 	hHijing = dynamic_cast<AliGenHijingEventHeader*>(headers->FindObject("Hijing"));
 	if (!hHijing) hHijing = dynamic_cast<AliGenHijingEventHeader*>(headers->FindObject("Hijing pPb_0"));
+	if (!hHijing) hHijing = dynamic_cast<AliGenHijingEventHeader*>(headers->FindObject("Hijing_0"));
       }
       else if (mcGenH->InheritsFrom(AliGenDPMjetEventHeader::Class())) {
 	dpmHeader = (AliGenDPMjetEventHeader*)mcGenH;

diff --git a/ANALYSIS/AliEPSelectionTask.cxx b/ANALYSIS/AliEPSelectionTask.cxx
@@ -332,6 +332,7 @@ void AliEPSelectionTask::UserExec(Option_t */*option*/)
       }
 
       esdEP = aod->GetHeader()->GetEventplaneP();
+      if(!esdEP) return; // protection against missing EP branch (nanoAODs)
       esdEP->Reset(); 
 
       Int_t maxID = 0;

diff --git a/ANALYSIS/AliPhysicsSelectionTask.cxx b/ANALYSIS/AliPhysicsSelectionTask.cxx
@@ -137,5 +137,5 @@ void AliPhysicsSelectionTask::Terminate(Option_t *)
   fout->Write();
   fout->Close();
 
-  Printf("Writting result to event_stat.root");
+  Printf("Writing result to event_stat.root");
 }