coverity fix

[u/mrichter/AliRoot.git] / EVGEN / AliDimuCombinator.cxx

diff --git a/EVGEN/AliDimuCombinator.cxx b/EVGEN/AliDimuCombinator.cxx
index 44001c878c2fb60597eca10af51270422d779960..dde7bbc73be6456a7cf7b9a9c2386f0cdda9f8d3 100644 (file)
--- a/EVGEN/AliDimuCombinator.cxx
+++ b/EVGEN/AliDimuCombinator.cxx
@@ -1,4 +1,4 @@
-/**************************************************************************
+ /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
@@ -35,27 +35,43 @@
 
 //
 ClassImp(AliDimuCombinator)
-    AliDimuCombinator::AliDimuCombinator() 
+
+AliDimuCombinator::AliDimuCombinator():
+    fNParticle((Int_t) (AliRunLoader::Instance()->TreeK())->GetEntries()),
+    fImuon1(0),
+    fImuon2(0),
+    fImin1(0),
+    fImin2(0),
+    fImax1(fNParticle),
+    fImax2(fNParticle),
+    fRate1(1.),
+    fRate2(1.),
+    fMuon1(0),
+    fMuon2(0),
+    fPtMin(0.),
+    fEtaMin(-10.),
+    fEtaMax(10.)
 {
 // Constructor
-    fNParticle = (Int_t) (gAlice->TreeK())->GetEntries();
-    fImuon1 = 0;
-    fImuon2 = 0;
-    fMuon1  = 0;
-    fMuon2  = 0;
-    fImin1  = 0;
-    fImin2  = 0;
-    fImax1  = fNParticle;
-    fImax2  = fNParticle;
-    fPtMin  = 0;
-    fEtaMin = -10;
-    fEtaMax = -10;
-    fRate1  = 1.;
-    fRate2  = 1.;
+    fNParticle = (Int_t) (AliRunLoader::Instance()->TreeK())->GetEntries();
 }
 
 AliDimuCombinator::AliDimuCombinator(const AliDimuCombinator & combinator)
-    :TObject(combinator)
+    :TObject(combinator),
+     fNParticle(0),
+     fImuon1(0),
+     fImuon2(0),
+     fImin1(0),
+     fImin2(0),
+     fImax1(0),
+     fImax2(0),
+     fRate1(0),
+     fRate2(0),
+     fMuon1(0),
+     fMuon2(0),
+     fPtMin(0.),
+     fEtaMin(0.),
+     fEtaMax(0.)
 {
 // Dummy copy constructor
     combinator.Copy(*this);
@@ -242,7 +258,7 @@ void AliDimuCombinator::SetSecondRange(Int_t from, Int_t to)
 //                       Selection
 //
 
-Bool_t AliDimuCombinator::Selected(TParticle* part) const
+Bool_t AliDimuCombinator::Selected(const TParticle* part) const
 {
 // Selection cut for single muon 
 //
@@ -255,7 +271,7 @@ Bool_t AliDimuCombinator::Selected(TParticle* part) const
     }
 }
 
-Bool_t AliDimuCombinator::Selected(TParticle* part1, TParticle* part2) const
+Bool_t AliDimuCombinator::Selected(const TParticle* part1, const TParticle* part2) const
 {
 // Selection cut for dimuons
 //
@@ -264,7 +280,7 @@ Bool_t AliDimuCombinator::Selected(TParticle* part1, TParticle* part2) const
 //
 //                       Kinematics
 //
-Float_t AliDimuCombinator::Mass(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::Mass(const TParticle* part1, const TParticle* part2) const
 {
 // Invariant mass
 //
@@ -281,7 +297,7 @@ Float_t AliDimuCombinator::Mass(TParticle* part1, TParticle* part2) const
     }
 }
 
-Float_t AliDimuCombinator::PT(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::PT(const TParticle* part1, const TParticle* part2) const
 {
 // Transverse momentum of dimuons
 //
@@ -291,14 +307,14 @@ Float_t AliDimuCombinator::PT(TParticle* part1, TParticle* part2) const
     return TMath::Sqrt(px*px+py*py);
 }
 
-Float_t AliDimuCombinator::Pz(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::Pz(const TParticle* part1, const TParticle* part2) const
 {
 // Pz of dimuon system
 //
     return part1->Pz()+part2->Pz();
 }
 
-Float_t AliDimuCombinator::Y(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::Y(const TParticle* part1, const TParticle* part2) const
 {
 // Rapidity of dimuon system
 //
@@ -318,7 +334,7 @@ void AliDimuCombinator::SmearGauss(Float_t width, Float_t & value) const
 //              Weighting
 // 
 
-Float_t AliDimuCombinator::DecayProbability(TParticle* part) const
+Float_t AliDimuCombinator::DecayProbability(const TParticle* part) const
 {
 // Calculate decay probability for muons from pion and kaon decays
 // 
@@ -367,7 +383,7 @@ Float_t AliDimuCombinator::DecayProbability(TParticle* part) const
 //End_Html
 
 
-Float_t AliDimuCombinator::Weight(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::Weight(const TParticle* part1, const TParticle* part2) const
 {
 // Dimuon weight
 
@@ -434,13 +450,13 @@ Indeed the 2 muons come from the same mother so the
 //End_Html
 
 
-Float_t AliDimuCombinator::Weight(TParticle* part) const
+Float_t AliDimuCombinator::Weight(const TParticle* part) const
 {
 // Single muon weight
     return (part->GetWeight())*(Parent(part)->GetWeight())*fRate1;
 }
 
-Bool_t  AliDimuCombinator::Correlated(TParticle* part1, TParticle* part2) const
+Bool_t  AliDimuCombinator::Correlated(const TParticle* part1, const TParticle* part2) const
 {
 // Check if muons are correlated
 //
@@ -452,14 +468,14 @@ Bool_t  AliDimuCombinator::Correlated(TParticle* part1, TParticle* part2) const
     }
 }
 
-TParticle* AliDimuCombinator::Parent(TParticle* part) const
+TParticle* AliDimuCombinator::Parent(const TParticle* part) const
 {
 // Return pointer to parent
 //
     return Particle(part->GetFirstMother());
 }
 
-Int_t AliDimuCombinator::Origin(TParticle* part) const
+Int_t AliDimuCombinator::Origin(const TParticle* part) const
 {
 // Return pointer to primary particle
 //
@@ -477,7 +493,7 @@ Int_t AliDimuCombinator::Origin(TParticle* part) const
     return iparent;
 }
 
-Int_t AliDimuCombinator::Type(TParticle *part)  const
+Int_t AliDimuCombinator::Type(const TParticle *part)  const
 {
 // Return particle type for 
 return part->GetPdgCode();