Fixing coding rule violations

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx
index 1bc4f33e0e5e299ba741507dec365186e8716d7f..8bf812215844c4207439fba6bdc9c969743fe4e5 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx
@@ -34,7 +34,7 @@ AliFmPhysicalHelix::AliFmPhysicalHelix(const AliFmThreeVector<double>& p,
   {
     using namespace units;
 #endif
-    SetCurvature(fabs((c_light*nanosecond/meter*q*B/tesla)/
+    SetCurvature(fabs((kCLight*nanosecond/meter*q*B/tesla)/
                      (abs(p.Mag())/GeV*fCosDipAngle)/meter));   
 #ifndef ST_NO_NAMESPACES
   }
@@ -56,7 +56,7 @@ AliFmThreeVector<double> AliFmPhysicalHelix::Momentum(double B) const
     {
            using namespace units;
 #endif
-           double pt = GeV*fabs(c_light*nanosecond/meter*B/tesla)/(fabs(fCurvature)*meter);
+           double pt = GeV*fabs(kCLight*nanosecond/meter*B/tesla)/(fabs(fCurvature)*meter);
            
            return (AliFmThreeVector<double>(pt*cos(fPhase+fH*M_PI/2),   // pos part pos field
                                          pt*sin(fPhase+fH*M_PI/2),

diff --git a/PWG2/FEMTOSCOPY/AliFemto/PhysicalConstants.h b/PWG2/FEMTOSCOPY/AliFemto/PhysicalConstants.h
index 3f6957c382bffed40aaee3b239a3f3e00cc8899d..2e0c5d5eee44715ade259fa10bcf55bb922858d8 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/PhysicalConstants.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/PhysicalConstants.h
@@ -64,8 +64,8 @@ static const double Avogadro = 6.0221367e+23/mole;
 // c   = 299.792458 mm/ns
 // c^2 = 898.7404 (mm/ns)^2 
 //
-static const double c_light   = 2.99792458e+8 * meter/second;
-static const double c_squared = c_light * c_light;
+static const double kCLight   = 2.99792458e+8 * meter/second;
+static const double kCSquared = kCLight * kCLight;
 /*
 //
 // h     = 4.13566e-12 MeV*ns
@@ -74,8 +74,8 @@ static const double c_squared = c_light * c_light;
 //
 static const double h_Planck      = 6.6260755e-34 * joule*second;
 static const double hbar_Planck   = h_Planck/twopi;
-static const double hbarc         = hbar_Planck * c_light;
-static const double hbarc_squared = hbarc * hbarc;
+static const double hbarc         = hbar_Planck * kCLight;
+static const double hbarcSquared = hbarc * hbarc;
 
 //
 //
@@ -88,18 +88,18 @@ static const double e_squared = eplus * eplus;
 // amu_c2 - atomic equivalent mass unit
 // amu    - atomic mass unit
 //
-static const double electron_mass_c2 = 0.51099906 * MeV;
-static const double   proton_mass_c2 = 938.27231 * MeV;
-static const double  neutron_mass_c2 = 939.56563 * MeV;
-static const double           amu_c2 = 931.49432 * MeV;
-//static const double              amu = amu_c2/c_squared;
+static const double   kElectronMassC2 = 0.51099906 * MeV;
+static const double     kProtonMassC2 = 938.27231 * MeV;
+static const double    kNeutronMassC2 = 939.56563 * MeV;
+static const double            kAmuC2 = 931.49432 * MeV;
+//static const double              amu = kAmuC2/cSquared;
 
-static const double kaon_0_short_mass_c2 = 497.672  * MeV;
-static const double    pion_plus_mass_c2 = 139.5700 * MeV;
-static const double   pion_minus_mass_c2 = 139.5700 * MeV;
-static const double       lambda_mass_c2 = 1115.684 * MeV;
-static const double   antilambda_mass_c2 = 1115.684 * MeV;
-static const double     xi_minus_mass_c2 = 1321.32  * MeV;
+static const double    kKaon0ShortMassC2 = 497.672  * MeV;
+static const double      kPionPlusMassC2 = 139.5700 * MeV;
+static const double     kPionMinusMassC2 = 139.5700 * MeV;
+static const double        kLambdaMassC2 = 1115.684 * MeV;
+static const double    kAntiLambdaMassC2 = 1115.684 * MeV;
+static const double       kXiMinusMassC2 = 1321.32  * MeV;
 
 /*
 //
@@ -107,22 +107,22 @@ static const double     xi_minus_mass_c2 = 1321.32  * MeV;
 // permittivity of free space epsil0 = 5.52636e+10 eplus^2/(MeV*mm)
 //
 static const double mu0      = 4*pi*1.e-7 * henry/meter;
-static const double epsilon0 = 1./(c_squared*mu0);
+static const double epsilon0 = 1./(cSquared*mu0);
 
 //
 // electromagnetic coupling = 1.43996e-12 MeV*mm/(eplus^2)
 //
 static const double elm_coupling           = e_squared/(4*pi*epsilon0);
 static const double fine_structure_const   = elm_coupling/hbarc;
-static const double classic_electr_radius  = elm_coupling/electron_mass_c2;
-static const double electron_Compton_length = hbarc/electron_mass_c2;
+static const double classic_electr_radius  = elm_coupling/kElectronMassC2;
+static const double electron_Compton_length = hbarc/kElectronMassC2;
 static const double Bohr_radius = electron_Compton_length/fine_structure_const;
 
 static const double alpha_rcl2 = fine_structure_const
                                    *classic_electr_radius
                                    *classic_electr_radius;
 
-static const double twopi_mc2_rcl2 = twopi*electron_mass_c2
+static const double twopi_mc2_rcl2 = twopi*kElectronMassC2
                                              *classic_electr_radius
                                              *classic_electr_radius;
 //

diff --git a/PWG2/FEMTOSCOPY/AliFemto/phys_constants.h b/PWG2/FEMTOSCOPY/AliFemto/phys_constants.h
index adf5931593d770b10f05ad99d708d12d925b37f3..e0dcee3b6272d25a9befe120c3f0087cb815f0b8 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/phys_constants.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/phys_constants.h
@@ -8,12 +8,12 @@
 #include "PhysicalConstants.h"  // from StarClassLibrary
 
 // the strangeness guys used a different naming system (of course)
-static const double M_LAMBDA        = lambda_mass_c2;
-static const double M_KAON_0_SHORT  = kaon_0_short_mass_c2;
-static const double M_PROTON        = proton_mass_c2;
-static const double M_PION_PLUS     = pion_plus_mass_c2;
-static const double M_PION_MINUS    = pion_minus_mass_c2;
-static const double M_XI_MINUS      = xi_minus_mass_c2;
+static const double M_LAMBDA        = kLambdaMassC2;
+static const double M_KAON_0_SHORT  = kKaon0ShortMassC2;
+static const double M_PROTON        = kProtonMassC2;
+static const double M_PION_PLUS     = kPionPlusMassC2;
+static const double M_PION_MINUS    = kPionMinusMassC2;
+static const double M_XI_MINUS      = kXiMinusMassC2;
 static const double M_OMEGA_MINUS   = 1672.45;
 static const double M_KAON_MINUS    = 493.677;
 static const double M_KAON_PLUS     = 493.677;