From 92847124654ee2dcf14e21e9d2973cd0315a0221 Mon Sep 17 00:00:00 2001 From: morsch Date: Thu, 27 Jan 2011 08:54:36 +0000 Subject: [PATCH] Coverity fixes. --- PYTHIA6/AliDecayerPythia.cxx | 3 ++- PYTHIA6/AliGenPythia.cxx | 17 +++++++++++------ PYTHIA6/AliGenPythiaPlus.cxx | 6 ++++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/PYTHIA6/AliDecayerPythia.cxx b/PYTHIA6/AliDecayerPythia.cxx index 6cf6d84a1ff..2b429d185fc 100644 --- a/PYTHIA6/AliDecayerPythia.cxx +++ b/PYTHIA6/AliDecayerPythia.cxx @@ -161,7 +161,6 @@ void AliDecayerPythia::ForceDecay() // Decay_t decay=fDecay; fPythia->SetMSTJ(21,2); - if (decay == kNoDecayHeavy) return; // // select mode @@ -379,8 +378,10 @@ void AliDecayerPythia::ForceDecay() break; case kOmega: ForceOmega(); + break; case kLambda: ForceLambda(); + break; case kAll: break; case kNoDecay: diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx index d1815ba0a35..7bd686a0abd 100644 --- a/PYTHIA6/AliGenPythia.cxx +++ b/PYTHIA6/AliGenPythia.cxx @@ -971,8 +971,11 @@ Int_t AliGenPythia::GenerateMB() ok =kTRUE; } } - if(!ok) + if(!ok) { + delete[] pParent; return 0; + } + AliDebug(5,Form("Found an electron jet (pt,eta,phi) = (%f,%f,%f)",pt,eta,phi)); } // Check for minimum multiplicity @@ -1462,17 +1465,19 @@ void AliGenPythia::LoadEvent(TObjArray* stack, Int_t flag, Int_t reHadr) for (Int_t part = 0; part < npart; part++) { TParticle *mPart = dynamic_cast(stack->At(part)); + if (!mPart) continue; + Int_t kf = mPart->GetPdgCode(); Int_t ks = mPart->GetStatusCode(); Int_t idf = mPart->GetFirstDaughter(); Int_t idl = mPart->GetLastDaughter(); if (reHadr) { - if (ks == 11 || ks == 12) { - ks -= 10; - idf = -1; - idl = -1; - } + if (ks == 11 || ks == 12) { + ks -= 10; + idf = -1; + idl = -1; + } } Float_t px = mPart->Px(); diff --git a/PYTHIA6/AliGenPythiaPlus.cxx b/PYTHIA6/AliGenPythiaPlus.cxx index cff2486419f..6167bf0c9e4 100644 --- a/PYTHIA6/AliGenPythiaPlus.cxx +++ b/PYTHIA6/AliGenPythiaPlus.cxx @@ -893,8 +893,10 @@ Int_t AliGenPythiaPlus::GenerateMB() if(!okd && iphcand != -1) // execute rotation in phi RotatePhi(iphcand,okd); - if(!okd) - return 0; + if(!okd) { + delete[] pParent; + return 0; + } } if (fTriggerParticle) { -- 2.43.0