From d02d3abdca4d29d26e6f593e8d2c3a559a2928c7 Mon Sep 17 00:00:00 2001 From: akisiel Date: Wed, 17 Jun 2009 10:17:33 +0000 Subject: [PATCH] Fix warnings --- TTherminator/Therminator/Event.cxx | 32 +++++++++++++++++------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/TTherminator/Therminator/Event.cxx b/TTherminator/Therminator/Event.cxx index 61d62adeb25..0949c42bb32 100644 --- a/TTherminator/Therminator/Event.cxx +++ b/TTherminator/Therminator/Event.cxx @@ -198,19 +198,22 @@ Event::AddParticle(Particle* aParticle) if (((*tPLIter).GetMass() == aParticle->GetMass()) && ((*tPLIter).GetI3() == aParticle->GetI3()) && ((*tPLIter).GetBarionN() == aParticle->GetBarionN()) && - ((*tPLIter).GetStrangeness() == aParticle->GetStrangeness())) - break; - if ((*tPLIter).GetMass() < aParticle->GetMass()) - break; - else if ((*tPLIter).GetMass() == aParticle->GetMass()) - if ((*tPLIter).GetI3() < aParticle->GetI3()) - break; - else if ((*tPLIter).GetI3() == aParticle->GetI3()) - if ((*tPLIter).GetBarionN() < aParticle->GetBarionN()) - break; - else if ((*tPLIter).GetBarionN() == aParticle->GetBarionN()) - if ((*tPLIter).GetStrangeness() < aParticle->GetStrangeness()) - break; + ((*tPLIter).GetStrangeness() == aParticle->GetStrangeness())) { + break; } + if ((*tPLIter).GetMass() < aParticle->GetMass()) { + break; } + else if ((*tPLIter).GetMass() == aParticle->GetMass()) { + if ((*tPLIter).GetI3() < aParticle->GetI3()) { + break; } + else if ((*tPLIter).GetI3() == aParticle->GetI3()) { + if ((*tPLIter).GetBarionN() < aParticle->GetBarionN()) { + break; } + else if ((*tPLIter).GetBarionN() == aParticle->GetBarionN()) { + if ((*tPLIter).GetStrangeness() < aParticle->GetStrangeness()) { + break; } + } + } + } tPLIter++; } mParticles.insert(tPLIter, *aParticle); @@ -294,7 +297,7 @@ Event::DecayParticles() // InitParticleScan(); while ((tFather = GetParticleOfCount(tCount))) { - if (tFather->GetParticleType()->GetGamma() >= 0.0) + if (tFather->GetParticleType()->GetGamma() >= 0.0) { if ((tFather->GetParticleType()->GetTable()) && (((DecayTable *) tFather->GetParticleType()->GetTable())->GetChannelCount()+1 > 0)) { tDecayer->DecayParticle(tFather, &tPart1, &tPart2, &tPart3); @@ -336,6 +339,7 @@ Event::DecayParticles() else { } + } tCount++; } -- 2.43.0