From 960f306f9a2a139cc7d0b9002d01adec551cfb15 Mon Sep 17 00:00:00 2001 From: Matevz Tadel <matevz.tadel@cern.ch> Date: Tue, 13 Jan 2009 09:57:55 +0000 Subject: [PATCH] Put local constants into an unnamed namespace. White-space. git-svn-id: http://root.cern.ch/svn/root/trunk@27130 27541ba8-7e3a-0410-8455-c3a389f83636 --- graf3d/eve/inc/TEveTrackPropagator.h | 2 +- graf3d/eve/src/TEveTrackPropagator.cxx | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/graf3d/eve/inc/TEveTrackPropagator.h b/graf3d/eve/inc/TEveTrackPropagator.h index e0a11bec467..e2ffcab7fb4 100644 --- a/graf3d/eve/inc/TEveTrackPropagator.h +++ b/graf3d/eve/inc/TEveTrackPropagator.h @@ -60,7 +60,7 @@ protected: TEveVector fB; public: - TEveMagFieldConst(Float_t x, Float_t y, Float_t z) : TEveMagField(), fB(x, y, z) + TEveMagFieldConst(Float_t x, Float_t y, Float_t z) : TEveMagField(), fB(x, y, z) { fFieldConstant = kTRUE; } virtual ~TEveMagFieldConst() {} diff --git a/graf3d/eve/src/TEveTrackPropagator.cxx b/graf3d/eve/src/TEveTrackPropagator.cxx index ff955637d34..d2d11dc3dd5 100644 --- a/graf3d/eve/src/TEveTrackPropagator.cxx +++ b/graf3d/eve/src/TEveTrackPropagator.cxx @@ -16,9 +16,12 @@ #include <cassert> -static Float_t kBMin = 1e-6; -static Float_t kPtMinSqr = 1e-5; -static Float_t kStepEps = 1e-3; +namespace +{ + const Float_t kBMin = 1e-6; + const Float_t kPtMinSqr = 1e-5; + const Float_t kStepEps = 1e-3; +} //______________________________________________________________________________ TEveTrackPropagator::Helix_t::Helix_t() : @@ -673,7 +676,8 @@ void TEveTrackPropagator::SetMagField(Float_t bX, Float_t bY, Float_t bZ) void TEveTrackPropagator::SetMagFieldObj(TEveMagField *mff) { // Set constant magnetic field and rebuild tracks. - if (fMagFieldObj) delete fMagFieldObj; + + if (fMagFieldObj) delete fMagFieldObj; fMagFieldObj = mff; RebuildTracks(); @@ -813,7 +817,7 @@ void TEveTrackPropagator::SetMaxStep(Float_t x) //______________________________________________________________________________ void TEveTrackPropagator::OneStepRungeKutta(Double_t charge, Double_t step, - Double_t* vect, Double_t* vout) + Double_t* vect, Double_t* vout) { // Wrapper to step with method RungeKutta. -- GitLab