Cb update

.gitlab-ci.yml

@@ -32,6 +32,7 @@ common:setup:
       if [[ "${COMMON_BENCH_VERSION}" == "" ]] ; then
         export COMMON_BENCH_VERSION="master" 
       fi
+        export COMMON_BENCH_VERSION="docs"  # temporary
       echo "COMMON_BENCH_VERSION = ${COMMON_BENCH_VERSION}" 
       git clone -b "${COMMON_BENCH_VERSION}" https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup 
   script:

benchmarks/dis/analysis/dis_electrons.cxx

 #include "dis.h"
 #include "plot.h"
 
-#include <benchmark.h>
-#include <mt.h>
-#include <util.h>
+#include <common_bench/benchmark.h>
+#include <common_bench/mt.h>
+#include <common_bench/util.h>
 
 #include "ROOT/RDataFrame.hxx"
 #include <cmath>
@@ -150,7 +150,7 @@ int dis_electrons(const std::string& config_name)
 
   // create our test definition
   // test_tag
-  eic::util::Test dis_Q2_resolution{
+  common_bench::Test dis_Q2_resolution{
       {{"name", fmt::format("{}_Q2_resolution", test_tag)},
        {"title", "DIS Q2 resolution"},
        {"description",
@@ -290,7 +290,7 @@ int dis_electrons(const std::string& config_name)
 
     c.Print(fmt::format("{}momentum.png", output_prefix).c_str());
   }
-  eic::util::write_test({dis_Q2_resolution}, fmt::format("{}dis_electrons.json", output_prefix));
+  common_bench::write_test({dis_Q2_resolution}, fmt::format("{}dis_electrons.json", output_prefix));
 
   return 0;
 }

benchmarks/dvmp/analysis/vm_invar.cxx

 #include "dvmp.h"
 #include "plot.h"
 
-#include <benchmark.h>
-#include <mt.h>
-#include <util.h>
+#include <common_bench/benchmark.h>
+#include <common_bench/mt.h>
+#include <common_bench/util.h>
 
 #include <ROOT/RDataFrame.hxx>
 #include <cmath>
@@ -44,7 +44,7 @@ int vm_invar(const std::string& config_name)
 
   // create our test definition
   // test_tag
-  eic::util::Test Q2_resolution_test{
+  common_bench::Test Q2_resolution_test{
       {{"name", fmt::format("{}_Q2_resolution", test_tag)},
        {"title",
         fmt::format("Q^2 Resolution for {} -> {} events with {}", vm_name, decay_name, detector)},
@@ -238,7 +238,7 @@ int vm_invar(const std::string& config_name)
   Q2_resolution_test.error(-1);
 
   // write out our test data
-  eic::util::write_test(Q2_resolution_test, fmt::format("{}invar.json", output_prefix));
+  common_bench::write_test(Q2_resolution_test, fmt::format("{}invar.json", output_prefix));
 
   // That's all!
   return 0;

benchmarks/dvmp/analysis/vm_mass.cxx

 #include "dvmp.h"
 #include "plot.h"
 
-#include <benchmark.h>
-#include <mt.h>
-#include <util.h>
+#include <common_bench/benchmark.h>
+#include <common_bench/mt.h>
+#include <common_bench/util.h>
 
 #include <ROOT/RDataFrame.hxx>
 #include <cmath>
@@ -61,7 +61,7 @@ int vm_mass(const std::string& config_name)
 
   // create our test definition
   // test_tag
-  eic::util::Test mass_resolution_test{
+  common_bench::Test mass_resolution_test{
       {{"name", fmt::format("{}_mass_resolution", test_tag, vm_name, decay_name)},
        {"title", fmt::format("{} Invariant Mass Resolution for {} -> {} with {}", vm_name, vm_name,
                              decay_name, detector)},
@@ -281,7 +281,7 @@ int vm_mass(const std::string& config_name)
   
 
   // write out our test data
-  eic::util::write_test(mass_resolution_test, fmt::format("{}mass.json", output_prefix));
+  common_bench::write_test(mass_resolution_test, fmt::format("{}mass.json", output_prefix));
 
   // That's all!
   return 0;