From 1ea145ef887db504950388985f690c738730429e Mon Sep 17 00:00:00 2001 From: kleinb Date: Sat, 12 Mar 2011 12:43:50 +0000 Subject: [PATCH] fixed coverity reports --- .../AliAnalysisTaskFragmentationFunction.cxx | 16 +++++++------- PWG4/JetTasks/AliHistogramsUE.cxx | 2 +- PWG4/JetTasks/AliPWG4HighPtSpectra.cxx | 4 ++-- PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx | 21 ++++++++++++------- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx index d8f2f778cce..2bfa6aaaba3 100644 --- a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx +++ b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx @@ -3279,7 +3279,7 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *) if(fQAMode || fFFMode || fIJMode || fPhiCorrMode){ for(Int_t ij=0; ij(fJetsRecCuts->At(ij)); + AliAODJet* jet = (AliAODJet*)(fJetsRecCuts->At(ij)); if(fQAMode&2) fQAJetHistosRecCuts->FillJetQA( jet->Eta(), TVector2::Phi_0_2pi(jet->Phi()), jet->Pt()); if(ij==0){ // leading jet @@ -3349,7 +3349,7 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *) // phi correlation if(fPhiCorrMode){ for(Int_t it=0; it(fTracksRecCuts->At(it)); + AliVParticle *part = (AliVParticle*)(fTracksRecCuts->At(it)); Float_t partEta = part->Eta(); Float_t partPhi = part->Phi(); @@ -3433,8 +3433,8 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *) if(fDJMode){ if (nRecJetsCuts > 1) { - AliAODJet* jet1 = dynamic_cast(fJetsRecCuts->At(0)); - AliAODJet* jet2 = dynamic_cast(fJetsRecCuts->At(1)); + AliAODJet* jet1 = (AliAODJet*)(fJetsRecCuts->At(0)); + AliAODJet* jet2 = (AliAODJet*)(fJetsRecCuts->At(1)); // DiJet deltaphi calculation Double_t phi1 = TVector2::Phi_0_2pi(jet1->Phi()); @@ -3637,7 +3637,7 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *) { if (it < jettracklist1->GetSize()) { - Float_t trackPt1 = (dynamic_cast(jettracklist1->At(it)))->Pt(); + Float_t trackPt1 = ((AliVParticle*)jettracklist1->At(it))->Pt(); Float_t jetPt1 = jet1->Pt(); Bool_t incrementJetPt = (it==0) ? kTRUE : kFALSE; @@ -4339,7 +4339,7 @@ void AliAnalysisTaskFragmentationFunction::FillSingleTrackRecEffHisto(AliFragFun if(isGenPrim[iGen] != 1) continue; // select primaries AliAODMCParticle* gentrack = dynamic_cast (tracksGen->At(iGen)); - if(gentrack)continue; + if(!gentrack)continue; Double_t ptGen = gentrack->Pt(); Double_t etaGen = gentrack->Eta(); Double_t phiGen = TVector2::Phi_0_2pi(gentrack->Phi()); @@ -4732,7 +4732,7 @@ void AliAnalysisTaskFragmentationFunction::GetTracksOutOfNJets(Int_t nCases, TLi for(Int_t ipart=0; ipart(templist->At(randIndex[ipart])); + AliVParticle* track = (AliVParticle*)(templist->At(randIndex[ipart])); outputlist->Add(track); sumPt += track->Pt(); } @@ -5005,7 +5005,7 @@ void AliAnalysisTaskFragmentationFunction::FillBckgHistos(Int_t type, TList* inp for(Int_t it=0; itGetSize(); ++it){ - AliVParticle* trackVP = dynamic_cast(tracklistaside->At(it)); + AliVParticle* trackVP = (AliVParticle*)(tracklistaside->At(it)); TLorentzVector* trackV = new TLorentzVector(trackVP->Px(),trackVP->Py(),trackVP->Pz(),trackVP->P()); Float_t jetPt = jet->Pt(); diff --git a/PWG4/JetTasks/AliHistogramsUE.cxx b/PWG4/JetTasks/AliHistogramsUE.cxx index 0a7e6b79f2d..97df9b92c9d 100644 --- a/PWG4/JetTasks/AliHistogramsUE.cxx +++ b/PWG4/JetTasks/AliHistogramsUE.cxx @@ -1110,7 +1110,7 @@ void AliHistogramsUE::PlotBranchesUE(TString file, TString branches, Double_t mi TObject *o=0; Int_t br=0; while ( (o=next()) ){ - br++; + if(o)br++; } diff --git a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx index 04060683a2d..daac60f0f49 100644 --- a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx +++ b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx @@ -315,13 +315,13 @@ void AliPWG4HighPtSpectra::Exec(Option_t *) { if(!fESD->GetTrack(iTrack) ) continue; AliESDtrack* track = fESD->GetTrack(iTrack); - AliESDtrack* trackTPCESD = fESD->GetTrack(iTrack); + if(!track)continue; + AliESDtrack* trackTPCESD = 0; if(fTrackType==0) trackTPCESD = AliESDtrackCuts::GetTPCOnlyTrack(fESD,track->GetID()); else if(fTrackType==1) { trackTPCESD = AliESDtrackCuts::GetTPCOnlyTrack(fESD,track->GetID()); if(!trackTPCESD) { - delete trackTPCESD; continue; } AliExternalTrackParam exParam; diff --git a/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx b/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx index 41bcfff1c4a..cfedea758a3 100644 --- a/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx +++ b/PWG4/JetTasks/AliPWG4HighPtTrackQA.cxx @@ -418,8 +418,8 @@ Bool_t AliPWG4HighPtTrackQA::SelectEvent() { } //Check if vertex is reconstructed - if(fDataType==kESD) { - fVtx = dynamic_cast(fEvent)->GetPrimaryVertexSPD(); + if(fDataType==kESD&&dynamic_cast(fEvent)) { + fVtx = ((AliESDEvent*)fEvent)->GetPrimaryVertexSPD(); if(!fVtx) { fNEventReject->Fill("noVTX",1); @@ -449,8 +449,8 @@ Bool_t AliPWG4HighPtTrackQA::SelectEvent() { return selectEvent; } } - else if(fDataType==kAOD) { - const AliAODVertex *vtx = dynamic_cast(fEvent)->GetPrimaryVertexSPD(); + else if(fDataType==kAOD&&dynamic_cast(fEvent)) { + const AliAODVertex *vtx = ((AliAODEvent*)fEvent)->GetPrimaryVertexSPD(); if(!vtx) { fNEventReject->Fill("noVTX",1); selectEvent = kFALSE; @@ -519,10 +519,14 @@ Int_t AliPWG4HighPtTrackQA::CalculateCentrality(AliVEvent *ev){ //________________________________________________________________________ Int_t AliPWG4HighPtTrackQA::CalculateCentrality(AliESDEvent *esd){ + Float_t cent = 999; - if(esd->GetCentrality()){ - cent = esd->GetCentrality()->GetCentralityPercentile("V0M"); - if(fDebug>3) cout << "centrality: " << cent << endl; + + if(esd){ + if(esd->GetCentrality()){ + cent = esd->GetCentrality()->GetCentralityPercentile("V0M"); + if(fDebug>3) cout << "centrality: " << cent << endl; + } } if(cent>80)return 4; @@ -536,6 +540,7 @@ Int_t AliPWG4HighPtTrackQA::CalculateCentrality(AliESDEvent *esd){ //________________________________________________________________________ Int_t AliPWG4HighPtTrackQA::CalculateCentrality(AliAODEvent *aod){ + if(!aod)return 4; Float_t cent = aod->GetHeader()->GetCentrality(); cout << "centrality: " << cent << endl; if(cent>80)return 4; @@ -647,7 +652,6 @@ void AliPWG4HighPtTrackQA::DoAnalysisESD() { track = AliESDtrackCuts::GetTPCOnlyTrack(fESD,esdtrack->GetID()); if(!track) { fh1NTracksReject->Fill("noTPConly",1); - delete track; continue; } AliExternalTrackParam exParam; @@ -736,6 +740,7 @@ void AliPWG4HighPtTrackQA::DoAnalysisESD() { void AliPWG4HighPtTrackQA::DoAnalysisAOD() { AliAODEvent *aod = dynamic_cast(fEvent); + if(!aod)return; for (Int_t iTrack = 0; iTrack < fEvent->GetNumberOfTracks(); iTrack++) { AliAODTrack *aodtrack = aod->GetTrack(iTrack); -- 2.43.0