Merge branch 'master' into ziyue_work_branch

Roll back

accelerator @ f3ff428e

-Subproject commit f3ff428e3b926a41e95beaa984d8dc05cec37cc7

benchmarks/dis/analysis/dis_electrons.cxx

@@ -111,6 +111,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));
 
   return 0;
 }

benchmarks/dvmp/analysis/vm_invar.cxx

@@ -45,7 +45,7 @@ int vm_invar(const std::string& config_name)
   // create our test definition
   // test_tag
   eic::util::Test Q2_resolution_test{
-      {{"name", fmt::format("{}_{}_{}_Q2_resolution", test_tag, vm_name, decay_name)},
+      {{"name", fmt::format("{}_Q2_resolution", test_tag)},
        {"title",
         fmt::format("Q^2 Resolution for {} -> {} events with {}", vm_name, decay_name, detector)},
        {"description", "Invariant Mass Resolution calculated from raw "
@@ -245,7 +245,7 @@ TCanvas c{"canvas2", "canvas2", 1200, 1200};
   Q2_resolution_test.error(-1);
 
   // write out our test data
-  eic::util::write_test(Q2_resolution_test, fmt::format("{}vm_invar.json", output_prefix));
+  eic::util::write_test(Q2_resolution_test, fmt::format("{}invar.json", output_prefix));
 
   // That's all!
   return 0;

benchmarks/dvmp/analysis/vm_mass.cxx

@@ -47,7 +47,7 @@ int vm_mass(const std::string& config_name)
   // create our test definition
   // test_tag
   eic::util::Test mass_resolution_test{
-      {{"name", fmt::format("{}_{}_{}_mass_resolution", test_tag, vm_name, decay_name)},
+      {{"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)},
        {"description", "Invariant Mass Resolution calculated from raw "
@@ -247,7 +247,7 @@ int vm_mass(const std::string& config_name)
   mass_resolution_test.error(-1);
 
   // write out our test data
-  eic::util::write_test(mass_resolution_test, fmt::format("{}_mass.json", output_prefix));
+  eic::util::write_test(mass_resolution_test, fmt::format("{}mass.json", output_prefix));
 
   // That's all!
   return 0;