JetChem: fix for crash with PHOJET, Services: new vertex cut (nContrib> 2)Spectrum...

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetChem.cxx b/PWG4/JetTasks/AliAnalysisTaskJetChem.cxx
index 89509b04f4628cef05a51adaccf2bcbbbe15b279..b563753b59a0f4b495e55f10bb6b4e718afa877c 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetChem.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetChem.cxx
@@ -427,39 +427,40 @@ void  AliAnalysisTaskJetChem::AnalyseEvent()
     AliInfo("no prim Vertex found - skip event");
     fhPrimVertexNCont->Fill(-1);
     return; 
+  }
     
     
-    if(primVertex->GetName() == "TPCVertex"){
-      AliInfo("found TPC prim Vertex  - skip event");
-      fhPrimVertexNCont->Fill(-1);
-      return; 
-    }
-    
-    Int_t nVertContributors = primVertex->GetNContributors();
-    fhPrimVertexNCont->Fill(nVertContributors);
-    
-    //cout<<" prim vertex name "<<primVertex->GetName()<<" nCont "<<nVertContributors<<endl;
-    
-    if(nVertContributors<1){ // eventually check if not SPD vertex ??? 
-      AliInfo("prim vertex no contributors - skip event");
-      return;
-    }
-    
-    Double_t vertX = primVertex->GetX();
-    Double_t vertY = primVertex->GetY();
-    Double_t vertZ = primVertex->GetZ();
-    
-    Double_t vertRho = TMath::Sqrt(vertX*vertX+vertY*vertY);
+  if(primVertex->GetName() == "TPCVertex"){
+    AliInfo("found TPC prim Vertex  - skip event");
+    fhPrimVertexNCont->Fill(-1);
+    return; 
+  }
     
-    fhPrimVertexRho->Fill(vertRho);
-    fhPrimVertexZ->Fill(vertZ);
+  Int_t nVertContributors = primVertex->GetNContributors();
+  fhPrimVertexNCont->Fill(nVertContributors);
+  
+  //cout<<" prim vertex name "<<primVertex->GetName()<<" nCont "<<nVertContributors<<endl;
+  
+  if(nVertContributors<1){ // eventually check if not SPD vertex ??? 
+    AliInfo("prim vertex no contributors - skip event");
+    return;
+  }
     
-    if(TMath::Abs(vertZ)>10){
-      AliInfo(Form("prim vertex z=%f - skip event",vertZ));
-      return; 
-    }
+  Double_t vertX = primVertex->GetX();
+  Double_t vertY = primVertex->GetY();
+  Double_t vertZ = primVertex->GetZ();
+  
+  Double_t vertRho = TMath::Sqrt(vertX*vertX+vertY*vertY);
+  
+  fhPrimVertexRho->Fill(vertRho);
+  fhPrimVertexZ->Fill(vertZ);
+  
+  if(TMath::Abs(vertZ)>10){
+    AliInfo(Form("prim vertex z=%f - skip event",vertZ));
+    return; 
   }
   
+  
   Int_t pythiaPID = GetPythiaProcessID();
   
   // ------------------------------------------------
@@ -3660,14 +3661,14 @@ Int_t AliAnalysisTaskJetChem::GetPythiaProcessID(){
   
   AliMCEvent* mcEvent = mcHandler->MCEvent();
   if (!mcEvent) {
-    Printf("ERROR: Could not retrieve MC event");
+    AliInfo("could not retrieve MC event");
     return -1;
   }
   
   AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(mcEvent);
   
-  if (!mcEvent) {
-    Printf("ERROR: Could not retrieve pythiaEventHeader");
+  if (!pythiaGenHeader) {
+    AliInfo("Could not retrieve pythiaEventHeader");
     return -1;
   }
 

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
index d39ac721293e25345a2729d4f747b5273a12dbbf..6aefbc34def9def4e0be25b9e650973cabd2950d 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
@@ -272,7 +272,7 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
     Float_t xvtx = -999;
     Float_t yvtx = -999;
 
-    if(vtxESD->GetNContributors()>0){
+    if(vtxESD->GetNContributors()>2){
       zvtx = vtxESD->GetZ();
       yvtx = vtxESD->GetY();
       xvtx = vtxESD->GetX();
@@ -303,7 +303,7 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
     if(iTrig>=0){
       iTrig *= 3;
       fh2ESDTriggerRun->Fill(run,iTrig+1);
-      if(vtxESD->GetNContributors()>0){
+      if(vtxESD->GetNContributors()>2){
        fh2ESDTriggerRun->Fill(run,iTrig+2);
        fh2VtxXY->Fill(xvtx,yvtx);
       }
@@ -353,7 +353,7 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
        fh2ESDTriggerCount->Fill(it,kSelectedALICE); 
       }
       if(!fUsePhysicsSelection)cand =  AliAnalysisHelperJetTasks::IsTriggerFired(esd,AliAnalysisHelperJetTasks::kMB1);
-      if(vtxESD->GetNContributors()>0&&!vtxName.Contains("TPCVertex")){
+      if(vtxESD->GetNContributors()>2&&!vtxName.Contains("TPCVertex")){
        if(esdTrig)fh2ESDTriggerCount->Fill(it,kTriggeredVertex);
        Float_t zvtx = vtxESD->GetZ();
        if(esdEventSelected&&esdTrig){
@@ -377,7 +377,7 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
       Bool_t aodTrig = kFALSE;
       aodTrig = AliAnalysisHelperJetTasks::IsTriggerFired(aod,(AliAnalysisHelperJetTasks::Trigger)it);
       if(aodTrig)fh2TriggerCount->Fill(it,kAllTriggered);
-      if(vtxAOD->GetNContributors()>0&&!vtxTitle.Contains("TPCVertex")){
+      if(vtxAOD->GetNContributors()>2&&!vtxTitle.Contains("TPCVertex")){
        if(aodTrig)fh2TriggerCount->Fill(it,kTriggeredVertex);
        Float_t zvtx = vtxAOD->GetZ();
        if(aodTrig&&aodEventSelected){
@@ -436,7 +436,7 @@ Bool_t AliAnalysisTaskJetServices::IsEventSelectedESD(AliESDEvent* esd){
   
 
 
-  if(vtx->GetNContributors()<2)return kFALSE;
+  if(vtx->GetNContributors()<3)return kFALSE;
 
   // do not want tpc only primary vertex
   TString vtxName(vtx->GetName());
@@ -470,7 +470,7 @@ Bool_t AliAnalysisTaskJetServices::IsEventSelectedAOD(AliAODEvent* aod){
   
 
 
-  if(vtx->GetNContributors()<2)return kFALSE;
+  if(vtx->GetNContributors()<3)return kFALSE;
 
   // do not want tpc only primary vertex
   TString vtxName(vtx->GetName());

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
index c90873e9c5332f6f9a1827e77b95bf51c79f8d75..ebb17bcb17d5396b93db4cd0d2b028fe21fce07f 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
@@ -627,7 +627,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     AliAODJet *tmp = (AliAODJet*)(aodRecJets->At(ir));
     Float_t tmpPt = tmp->Pt();
     if(tmpPt>ptOld){
-      Printf("%s:%d Jets Not Sorted!! %d:%.3E %d%.3E",(char*)__FILE__,__LINE__,ir,tmpPt,ir-1,ptOld);
+      Printf("%s:%d Jets Not Sorted %s !! %d:%.3E %d:%.3E",(char*)__FILE__,__LINE__,fBranchRec.Data(),ir,tmpPt,ir-1,ptOld);
     }
     ptOld = tmpPt;
   }