From af0280a9483721bfe34701ed8cdb640accfaa2e4 Mon Sep 17 00:00:00 2001 From: loizides Date: Mon, 25 Jun 2012 07:07:28 +0000 Subject: [PATCH] coverty --- .../UserTasks/AliAnalysisTaskSOH.cxx | 3 +++ PWGGA/EMCALTasks/AliAnalysisTaskEmcal.cxx | 3 +++ PWGGA/EMCALTasks/AliAnalysisTaskSATR.cxx | 3 ++- PWGGA/EMCALTasks/AliEmcalCompatTask.cxx | 7 +++++- PWGGA/EMCALTasks/AliEmcalParticle.cxx | 23 +++++++++++------- PWGGA/EMCALTasks/AliEmcalPhysicsSelection.cxx | 24 ++++++++++--------- 6 files changed, 42 insertions(+), 21 deletions(-) diff --git a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSOH.cxx b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSOH.cxx index 64532ecc6fa..d091c8fdbcf 100644 --- a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSOH.cxx +++ b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSOH.cxx @@ -82,6 +82,9 @@ AliAnalysisTaskSOH::AliAnalysisTaskSOH(const char *name) : fHScaleFactor(0), fHScaleFactor100HC(0), fHEOverPVsPt(0x0), + fHEMCalResponsePion(0x0), + fHEMCalResponseElec(0x0), + fHEMCalResponseProton(0x0), fHEMCalRecdPhidEta(0x0), fHEMCalRecdPhidEtaP(0x0), fHEMCalRecdPhidEtaM(0x0), diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.cxx index 09f956a2141..c92a5881019 100644 --- a/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.cxx +++ b/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.cxx @@ -260,7 +260,10 @@ TClonesArray *AliAnalysisTaskEmcal::GetArrayFromEvent(const char *name, const ch AliWarning(Form("%s: Could not retrieve array with name %s!", GetName(), name)); return 0; } + } else { + return 0; } + if (!clname) return arr; diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskSATR.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskSATR.cxx index 0a399d33ae6..3184c28fc23 100644 --- a/PWGGA/EMCALTasks/AliAnalysisTaskSATR.cxx +++ b/PWGGA/EMCALTasks/AliAnalysisTaskSATR.cxx @@ -741,7 +741,8 @@ void AliAnalysisTaskSATR::UserExec(Option_t *) for (Int_t i = 0; i < NumberOfTriggerClusters; i++){ AliVCluster* trgCluster = dynamic_cast(triggerClusters->At(i)); - + if (!trgCluster) + continue; if (fCheckDeadClusters && trgCluster->GetDistanceToBadChannel() < 3) { AliWarning(Form("Trigger cluster %d removed from analysis because distance to bad channel = %f < 3", i, trgCluster->GetDistanceToBadChannel())); continue; diff --git a/PWGGA/EMCALTasks/AliEmcalCompatTask.cxx b/PWGGA/EMCALTasks/AliEmcalCompatTask.cxx index 47998e4c538..9ad40c91dee 100644 --- a/PWGGA/EMCALTasks/AliEmcalCompatTask.cxx +++ b/PWGGA/EMCALTasks/AliEmcalCompatTask.cxx @@ -68,8 +68,13 @@ void AliEmcalCompatTask::UserExec(Option_t *) TString title; if (header) title = header->GetTitle(); + else { + AliError(Form("%s: Header zero, returning!", GetName())); + return; + } + if (title.Length()==0) { - AliError("Title should encode offline trigger, returning"); + AliError(Form("%s: Title should encode offline trigger, returning!", GetName())); return; } else { UInt_t off = header->GetUniqueID(); diff --git a/PWGGA/EMCALTasks/AliEmcalParticle.cxx b/PWGGA/EMCALTasks/AliEmcalParticle.cxx index ad6a6519a0a..12e27035ab4 100644 --- a/PWGGA/EMCALTasks/AliEmcalParticle.cxx +++ b/PWGGA/EMCALTasks/AliEmcalParticle.cxx @@ -37,8 +37,10 @@ AliEmcalParticle::AliEmcalParticle(TObject *particle, Int_t id, Double_t vx, Dou { // Constructor. - if (!particle) + if (!particle) { AliWarning("Null pointer passed as particle."); + return; + } fTrack = dynamic_cast(particle); if (fTrack) { @@ -47,15 +49,20 @@ AliEmcalParticle::AliEmcalParticle(TObject *particle, Int_t id, Double_t vx, Dou fPt = fTrack->Pt(); } else { fCluster = dynamic_cast(particle); - Double_t vtx[3]; vtx[0]=vx;vtx[1]=vy;vtx[2]=vz; - TLorentzVector vect; - fCluster->GetMomentum(vect, vtx); - fEta = vect.Eta(); - fPhi = vect.Phi(); - fPt = vect.Pt(); + if (fCluster) { + Double_t vtx[3]; vtx[0]=vx;vtx[1]=vy;vtx[2]=vz; + TLorentzVector vect; + fCluster->GetMomentum(vect, vtx); + fEta = vect.Eta(); + fPhi = vect.Phi(); + fPt = vect.Pt(); + } } - if (!fTrack && !fCluster) + + if (!fTrack && !fCluster) { AliWarning("Particle type not recognized (not AliVTrack nor AliVCluster)."); + return; + } ResetMatchedObjects(); } diff --git a/PWGGA/EMCALTasks/AliEmcalPhysicsSelection.cxx b/PWGGA/EMCALTasks/AliEmcalPhysicsSelection.cxx index 09c03beae11..6e970b3d961 100644 --- a/PWGGA/EMCALTasks/AliEmcalPhysicsSelection.cxx +++ b/PWGGA/EMCALTasks/AliEmcalPhysicsSelection.cxx @@ -198,19 +198,21 @@ UInt_t AliEmcalPhysicsSelection::GetSelectionMask(const TObject* obj) } else { trks = dynamic_cast(aev->FindListObject("tracks")); } - const Int_t Ntracks = trks->GetEntriesFast(); - for (Int_t iTracks = 0; iTracks < Ntracks; ++iTracks) { - AliVTrack *track = static_cast(trks->At(iTracks)); - if (!track) - continue; - if (aev) { // a bit ugly since cuts are hard coded for now - AliAODTrack *aodtrack = static_cast(track); - if (!aodtrack->TestFilterBit(256) && !aodtrack->TestFilterBit(512)) + if (trks) { + const Int_t Ntracks = trks->GetEntriesFast(); + for (Int_t iTracks = 0; iTracks < Ntracks; ++iTracks) { + AliVTrack *track = static_cast(trks->At(iTracks)); + if (!track) continue; + if (aev) { // a bit ugly since cuts are hard coded for now + AliAODTrack *aodtrack = static_cast(track); + if (!aodtrack->TestFilterBit(256) && !aodtrack->TestFilterBit(512)) + continue; + } + Double_t pt = track->Pt(); + if (pt>fTrackMaxPt) + fTrackMaxPt = pt; } - Double_t pt = track->Pt(); - if (pt>fTrackMaxPt) - fTrackMaxPt = pt; } } -- 2.43.5