From b85b355c0f259d4d6219fd76467289fed9ad3ab8 Mon Sep 17 00:00:00 2001 From: kleinb Date: Thu, 17 Feb 2011 15:45:44 +0000 Subject: [PATCH] more coverity fixes --- PWG4/JetTasks/AliAnalyseUE.cxx | 11 ++++++++--- .../JetTasks/AliAnalysisTaskFragmentationFunction.cxx | 8 ++++---- PWG4/JetTasks/AliJetSpectrumUnfolding.cxx | 6 ++++++ PWG4/JetTasks/AliPWG4CosmicCandidates.cxx | 9 +++++++-- PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/PWG4/JetTasks/AliAnalyseUE.cxx b/PWG4/JetTasks/AliAnalyseUE.cxx index dcbbc295132..ac7f8e57b08 100644 --- a/PWG4/JetTasks/AliAnalyseUE.cxx +++ b/PWG4/JetTasks/AliAnalyseUE.cxx @@ -546,14 +546,16 @@ void AliAnalyseUE::FindMaxMinRegions(TVector3 *jetVect, Int_t conePosition, Int_ else { partMC = dynamic_cast(tca->At(ipart)); part = partMC; - charge = partMC->Charge(); + if(!partMC)return; + charge = partMC->Charge(); pt = partMC->Pt(); eta = partMC->Eta(); pdgcode = partMC->GetPdgCode(); suffix.Append("MC"); - } + } + + if(!part)return; - if (fDebug > 1) AliInfo(Form(" ==== AOD track = %d pt = %f charge = %d \n ",ipart,part->Pt(),part->Charge())); // track selection @@ -1320,6 +1322,7 @@ TObjArray* AliAnalyseUE::SortChargedParticlesMC() for (Int_t ipart=0; ipart(tca->At(ipart)); + if(!part)continue; if(!part->IsPhysicalPrimary())continue; if( part->Pt() < fTrackPtCut ) continue; if(!part->Charge()) continue; @@ -1415,8 +1418,10 @@ Bool_t AliAnalyseUE::TrackSelectedEfficiency(AliAODTrack* part)const{ Int_t label = part->GetLabel(); TClonesArray *tca=0; tca = dynamic_cast(fkAOD->FindListObject(AliAODMCParticle::StdBranchName())); + if(!tca)return kFALSE; //TParticle *partMC = fStack->ParticleFromTreeK(label); AliAODMCParticle *partMC=dynamic_cast(tca->At(TMath::Abs(label))); + if(!partMC)return kFALSE; if (!partMC->IsPhysicalPrimary())return kFALSE; //charge = ((TParticlePDG*)partMC->GetPDG())->Charge(); charge = partMC->Charge(); diff --git a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx index 429cccdbad0..d8f2f778cce 100644 --- a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx +++ b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx @@ -3254,15 +3254,15 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *) if(fQAMode&1){ for(Int_t it=0; it(fTracksRec->At(it)); - fQATrackHistosRec->FillTrackQA( part->Eta(), TVector2::Phi_0_2pi(part->Phi()), part->Pt()); + if(part)fQATrackHistosRec->FillTrackQA( part->Eta(), TVector2::Phi_0_2pi(part->Phi()), part->Pt()); } for(Int_t it=0; it(fTracksRecCuts->At(it)); - fQATrackHistosRecCuts->FillTrackQA( part->Eta(), TVector2::Phi_0_2pi(part->Phi()), part->Pt()); + if(part)fQATrackHistosRecCuts->FillTrackQA( part->Eta(), TVector2::Phi_0_2pi(part->Phi()), part->Pt()); } for(Int_t it=0; it(fTracksGen->At(it)); - fQATrackHistosGen->FillTrackQA( part->Eta(), TVector2::Phi_0_2pi(part->Phi()), part->Pt()); + if(part)fQATrackHistosGen->FillTrackQA( part->Eta(), TVector2::Phi_0_2pi(part->Phi()), part->Pt()); } } @@ -3271,7 +3271,7 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *) if(fQAMode&2){ for(Int_t ij=0; ij(fJetsRec->At(ij)); - fQAJetHistosRec->FillJetQA( jet->Eta(), TVector2::Phi_0_2pi(jet->Phi()), jet->Pt()); + if(jet)fQAJetHistosRec->FillJetQA( jet->Eta(), TVector2::Phi_0_2pi(jet->Phi()), jet->Pt()); } } } diff --git a/PWG4/JetTasks/AliJetSpectrumUnfolding.cxx b/PWG4/JetTasks/AliJetSpectrumUnfolding.cxx index d1d5f3f329f..16636d2636e 100644 --- a/PWG4/JetTasks/AliJetSpectrumUnfolding.cxx +++ b/PWG4/JetTasks/AliJetSpectrumUnfolding.cxx @@ -194,9 +194,13 @@ Bool_t AliJetSpectrumUnfolding::LoadHistograms(const Char_t* dir) oldHistograms.SetOwner(1); if (fGenSpectrum) oldHistograms.Add(fGenSpectrum); + else return kFALSE; if (fRecSpectrum) oldHistograms.Add(fRecSpectrum); + else return kFALSE; if (fUnfSpectrum) oldHistograms.Add(fUnfSpectrum); + else return kFALSE; if (fCorrelation) oldHistograms.Add(fCorrelation); + else return kFALSE; // load new histograms fGenSpectrum = dynamic_cast (gDirectory->Get(fGenSpectrum->GetName())); @@ -1137,6 +1141,8 @@ TH2F* AliJetSpectrumUnfolding::CalculateRecSpectrum(TH2* const inputGen) } TH2F* target = dynamic_cast (fRecSpectrum->Clone(Form("reconstructed_%s", inputGen->GetName()))); + if(!targer)return 0; + target->Reset(); for (Int_t me=1; me<=fgkNBINSE; ++me) diff --git a/PWG4/JetTasks/AliPWG4CosmicCandidates.cxx b/PWG4/JetTasks/AliPWG4CosmicCandidates.cxx index 871568ce8da..bc28353b492 100644 --- a/PWG4/JetTasks/AliPWG4CosmicCandidates.cxx +++ b/PWG4/JetTasks/AliPWG4CosmicCandidates.cxx @@ -270,9 +270,14 @@ void AliPWG4CosmicCandidates::UserExec(Option_t *) } const AliVVertex *vtx = fInputEvent->GetPrimaryVertex(); - // Need vertex cut + if(!vtx){ + PostData(1, fHistListCosmics); + return; + } + +// Need vertex cut TString vtxName(vtx->GetName()); - if(!vtx || vtx->GetNContributors() < 2 || (vtxName.Contains("TPCVertex")) ) { + if( vtx->GetNContributors() < 2 || (vtxName.Contains("TPCVertex")) ) { // Post output data PostData(1, fHistListCosmics); return; diff --git a/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx b/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx index c06abf1818e..37ca693f1e0 100644 --- a/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx +++ b/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx @@ -933,8 +933,8 @@ void AliPWG4HighPtQATPConly::Exec(Option_t *) { for (Int_t iTrack = 0; iTrack < nTracks; iTrack++) { AliESDtrack *track = fESD->GetTrack(iTrack); - AliExternalTrackParam *trackTPC = (AliExternalTrackParam *)track->GetTPCInnerParam(); if(!track || !trackTPC) continue; + AliExternalTrackParam *trackTPC = (AliExternalTrackParam *)track->GetTPCInnerParam(); const AliESDfriendTrack* constfriendtrack = 0x0; if(fESDfriend && fESDfriend->TestSkipBit()==kFALSE) constfriendtrack = track->GetFriendTrack(); -- 2.43.0