More coverty problems fixed

diff --git a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
index 6aca105b5aee5f4cf18822922c640eed0d1b06c3..d4e1ac197465b34f741b50f5f43e6eb51c646142 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
+++ b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
@@ -375,6 +375,7 @@ void  AliAnalysisHelperJetTasks::MergeOutputDirs(const char* cFiles,const char*
     TFile* fIn = dynamic_cast<TFile*>(fileList.At(0));
     if(!fIn){
       Printf("Input File not Found");
+      return;
     }
     // fetch the keys for the directories
     TList *ldKeys = fIn->GetListOfKeys();

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum.cxx b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum.cxx
index b273deb738dac8236f41c6ff9c5f444a16a07866..c5298381c368d2a4e143b6aa69d7e4bc99e16aa1 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum.cxx
@@ -215,10 +215,12 @@ Bool_t AliAnalysisTaskJetSpectrum::Notify()
       if(!xtree){
        Printf("%s:%d tree not found in the pyxsec.root",(char*)__FILE__,__LINE__);
       }
-      xtree->SetBranchAddress("xsection",&xsection);
-      xtree->SetBranchAddress("ntrials",&ntrials);
-      ftrials = ntrials;
-      xtree->GetEntry(0);
+      else{
+       xtree->SetBranchAddress("xsection",&xsection);
+       xtree->SetBranchAddress("ntrials",&ntrials);
+       ftrials = ntrials;
+       xtree->GetEntry(0);
+      }
     }
     fh1Xsec->Fill("<#sigma>",xsection);
     fh1Trials->Fill("#sum{ntrials}",ftrials);

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
index 66bf3da6aec9d1a7b8beac445ebf4a43295b9d0a..96c35c33cd4780904b199b7c954d39adb58b5c8f 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
@@ -347,7 +347,7 @@ Bool_t AliAnalysisTaskJetSpectrum2::Notify()
   if(fNonStdFile.Length()!=0){
     // case that we have an AOD extension we need can fetch the jets from the extended output
     AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
-    fAODExtension = aodH->GetExtension(fNonStdFile.Data());    
+    fAODExtension = (aodH?aodH->GetExtension(fNonStdFile.Data()):0);    
     if(!fAODExtension){
       if(fDebug>1)Printf("AODExtension found for %s",fNonStdFile.Data());
     }
@@ -1045,8 +1045,8 @@ void AliAnalysisTaskJetSpectrum2::FillJetHistos(TList &jetsList,TList &particles
   if(nOver>0){
     TIterator *jetIter = jetsList.MakeIterator();
     AliAODJet *tmpJet = (AliAODJet*)(jetIter->Next());  
-    Float_t pt = tmpJet->Pt();
     if(tmpJet){
+      Float_t pt = tmpJet->Pt();
       for(int i = 1;i <= fh2NJetsPt[iType]->GetNbinsX();i++){
        Float_t ptCut = fh2NJetsPt[iType]->GetXaxis()->GetBinCenter(i);
        while(pt<ptCut&&tmpJet){
@@ -1381,6 +1381,7 @@ void AliAnalysisTaskJetSpectrum2::UserExecOld(Option_t */*option*/)
        Int_t iSubJetCounter = 0;
        for(Int_t k=0;k<nJets;k++){
         AliAODJet *jet = dynamic_cast<AliAODJet*>(aodRecJets->At(k));
+        if(!jet)continue;
         fh1Ptjet->Fill(jet->Pt());
         Float_t ptsub1=jet->Pt()-bkg1*jet->EffectiveAreaCharged();
         Float_t ptsub2=jet->Pt()-bkg2*jet->EffectiveAreaCharged();
@@ -1573,8 +1574,9 @@ void AliAnalysisTaskJetSpectrum2::UserExecOld(Option_t */*option*/)
   if(nRecOver>0){
     TIterator *recIter = aodRecJets->MakeIterator();
     AliAODJet *tmpRec = (AliAODJet*)(recIter->Next());  
-    Float_t pt = tmpRec->Pt();
+    Float_t pt = 0;
     if(tmpRec){
+      pt = tmpRec->Pt();
       for(int i = 1;i <= fh2NRecJetsPt->GetNbinsX();i++){
        Float_t ptCut = fh2NRecJetsPt->GetXaxis()->GetBinCenter(i);
        while(pt<ptCut&&tmpRec){
@@ -2091,6 +2093,7 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
     if(!tca)return iCount;
     for(int it = 0;it < tca->GetEntriesFast();++it){
       AliAODMCParticle *part = dynamic_cast<AliAODMCParticle*>(tca->At(it));
+      if(!part)continue;
       if(part->Pt()<fMinTrackPt)continue;
       if(!part->IsPhysicalPrimary())continue;
       if(type == kTrackAODMCAll){

diff --git a/PWG4/JetTasks/AliAnalysisTaskQGSep.cxx b/PWG4/JetTasks/AliAnalysisTaskQGSep.cxx
index 4630e38294c0623c39bf580dbba686fde3acd56b..d3396d0357adb17a165abf945cbcffabeda1c121 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskQGSep.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskQGSep.cxx
@@ -287,7 +287,7 @@ void AliAnalysisTaskQGSep::LoopAOD(){
   }
 
   Int_t idxj[4];
-  TMath::Sort(nRecJets, e, idxj);
+  TMath::Sort(TMath::Min(nRecJets,4), e, idxj);
   for(Int_t i = 0; i < nRecJets; i++){
     recJets[i] = rJets[idxj[i]];
   }
@@ -427,7 +427,7 @@ void AliAnalysisTaskQGSep::LoopAODMC(){
   }
 
   Int_t idxj[4];
-  TMath::Sort(nRecJets, e, idxj);
+  TMath::Sort(TMath::Min(nRecJets,4), e, idxj);
   for(Int_t i = 0; i < nRecJets; i++){
     recJets[i] = rJets[idxj[i]];
   }
@@ -449,7 +449,7 @@ void AliAnalysisTaskQGSep::LoopAODMC(){
   TMath::Sort(nMCtracks, pTMC, idxMC);
   
   
-  Int_t flagQ[4], flagG[4];   
+  Int_t flagQ[4] = {0}, flagG[4] = {0};   
   for(Int_t iJ = 0; iJ < nRecJets; iJ++){
     //flag jet as q/g