modified: dvmp.h

	modified:   vm_mass.cxx

benchmarks/dvmp/analysis/dvmp.h

@@ -49,10 +49,10 @@ namespace util {
     for(int i = 0 ; i < 7 ; i++) momenta[i].SetPxPyPzE(0., 0., 0., 0.);   //initialize as all 0
     
     //manually set incoming electron and proton;
-    double e0_mass = get_pdg_mass("electron");
+    double e0_mass = common_bench::get_pdg_mass("electron");
     double e0_pz = 1.305e-8 - 10.;
     momenta[0].SetPxPyPzE(0., 0., e0_pz, sqrt(e0_mass*e0_mass + e0_pz*e0_pz));
-    double p0_mass = get_pdg_mass("proton");
+    double p0_mass = common_bench::get_pdg_mass("proton");
     double p0_pz = 99.995598 + 1.313e-7 + 8.783e-11;
     momenta[1].SetPxPyPzE(0., 0., p0_pz, sqrt(p0_mass*p0_mass + p0_pz*p0_pz));
     
@@ -88,7 +88,7 @@ namespace util {
         double energy_tmp2 = parts[j].energy;
         lpt_2.SetPxPyPzE(parts[j].p.x, parts[j].p.y, parts[j].p.z, energy_tmp2);        
         const double new_mass{(lpt_1 + lpt_2).mass()};
-        if (fabs(new_mass - get_pdg_mass(mother)) < fabs(best_mass - get_pdg_mass(mother))) {
+        if (fabs(new_mass - common_bench::get_pdg_mass(mother)) < fabs(best_mass - common_bench::get_pdg_mass(mother))) {
           first = i;
           second = j;
           best_mass = new_mass;

benchmarks/dvmp/analysis/vm_mass.cxx

@@ -74,8 +74,8 @@ int vm_mass(const std::string& config_name)
   ROOT::EnableImplicitMT(kNumThreads);
 
   // The particles we are looking for. E.g. J/psi decaying into e+e-
-  const double vm_mass    = util::get_pdg_mass(vm_name);
-  const double decay_mass = util::get_pdg_mass(decay_name);
+  const double vm_mass    = common_bench::get_pdg_mass(vm_name);
+  const double decay_mass = common_bench::get_pdg_mass(decay_name);
 
   // Ensure our output prefix always ends on a dot, a slash or a dash
   if (output_prefix.back() != '.' && output_prefix.back() != '/' && output_prefix.back() != '-') {