From d35832cf9368933cbaadf5ac6981ff2e867597e9 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Tue, 2 Feb 2021 21:48:19 +0000
Subject: [PATCH] Fixed some inconsistencies in the test names, and made sure
the DIS tests also generate output
---
benchmarks/dis/analysis/dis_electrons.cxx | 1 +
benchmarks/dvmp/analysis/vm_invar.cxx | 4 ++--
benchmarks/dvmp/analysis/vm_mass.cxx | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/benchmarks/dis/analysis/dis_electrons.cxx b/benchmarks/dis/analysis/dis_electrons.cxx
index 02dc7b0d..109c81f1 100644
--- a/benchmarks/dis/analysis/dis_electrons.cxx
+++ b/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;
}
diff --git a/benchmarks/dvmp/analysis/vm_invar.cxx b/benchmarks/dvmp/analysis/vm_invar.cxx
index 03349825..bbc4db27 100644
--- a/benchmarks/dvmp/analysis/vm_invar.cxx
+++ b/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 "
@@ -186,7 +186,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("{}vm_invar.json", output_prefix));
+ eic::util::write_test(Q2_resolution_test, fmt::format("{}invar.json", output_prefix));
// That's all!
return 0;
diff --git a/benchmarks/dvmp/analysis/vm_mass.cxx b/benchmarks/dvmp/analysis/vm_mass.cxx
index 82abba6f..37c5d386 100644
--- a/benchmarks/dvmp/analysis/vm_mass.cxx
+++ b/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;
--
GitLab