From a15c0cdd91e32a8d207fa4a61a0787e4017776fb Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sat, 24 Jul 2021 03:55:43 -0500
Subject: [PATCH] Testing new common bench setup
modified: .gitlab-ci.yml
modified: benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
modified: benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
modified: benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx
---
.gitlab-ci.yml | 1 +
.../scripts/emcal_barrel_pi0_analysis.cxx | 10 +++++-----
.../emcal_barrel_pion_rejection_analysis.cxx | 20 +++++++++----------
.../scripts/emcal_barrel_pions_analysis.cxx | 6 +++---
4 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a3563cb..8f2dc60c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,6 +41,7 @@ common:setup:
if [[ "${COMMON_BENCH_VERSION}" == "" ]] ; then
export COMMON_BENCH_VERSION="master"
fi
+ export COMMON_BENCH_VERSION="docs"
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:
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
index b158f351..7c367b78 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
@@ -9,9 +9,9 @@
#include "dd4pod/Geant4ParticleCollection.h"
#include "dd4pod/CalorimeterHitCollection.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"
R__LOAD_LIBRARY(libfmt.so)
#include "fmt/core.h"
@@ -192,7 +192,7 @@ void emcal_barrel_pi0_analysis(const char* input_fname = "sim_output/sim_emcal_b
double resolutionTarget = TMath::Sqrt(0.12 * 0.12 / meanE + 0.02 * 0.02);
- eic::util::Test pi0_energy_resolution{
+ common_bench::Test pi0_energy_resolution{
{{"name", fmt::format("{}_energy_resolution", test_tag)},
{"title", "Pi0 Energy resolution"},
{"description",
@@ -233,5 +233,5 @@ void emcal_barrel_pi0_analysis(const char* input_fname = "sim_output/sim_emcal_b
cdE_rel->SaveAs("results/emcal_barrel_pi0_dE_rel.png");
cdE_rel->SaveAs("results/emcal_barrel_pi0_dE_rel.pdf");
- eic::util::write_test({pi0_energy_resolution}, fmt::format("results/{}_pi0.json", detEle));
+ common_bench::write_test({pi0_energy_resolution}, fmt::format("results/{}_pi0.json", detEle));
}
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
index e1e6295c..63661655 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
@@ -11,9 +11,9 @@
#include "dd4pod/Geant4ParticleCollection.h"
#include "dd4pod/CalorimeterHitCollection.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 <boost/range/combine.hpp>
@@ -603,7 +603,7 @@ void emcal_barrel_pion_rejection_analysis(
}
// E, Eta = 18, 2
- eic::util::Test pion_rejection_E18_Eta2{
+ common_bench::Test pion_rejection_E18_Eta2{
{{"name", fmt::format("{}_E{}_EtaBin{}", test_tag, (int)E[0], 2)},
{"title", "Pion Rejection1"},
{"description", fmt::format("Pion rejection with E = {}, and {}", (int)E[0], etaTitle[2])},
@@ -617,7 +617,7 @@ void emcal_barrel_pion_rejection_analysis(
suppression * maxRate[0][2] >= rejRatios[0][2] ? pion_rejection_E18_Eta2.pass(rejRatios[0][2]) : pion_rejection_E18_Eta2.fail(rejRatios[0][2]);
// E, Eta = 18, 3
- eic::util::Test pion_rejection_E18_Eta3{
+ common_bench::Test pion_rejection_E18_Eta3{
{{"name", fmt::format("{}_E{}_EtaBin{}", test_tag, (int)E[0], 3)},
{"title", "Pion Rejection"},
{"description", fmt::format("Pion rejection with E = {}, and {}", (int)E[0], etaTitle[3])},
@@ -631,7 +631,7 @@ void emcal_barrel_pion_rejection_analysis(
suppression * maxRate[0][3] >= rejRatios[0][3] ? pion_rejection_E18_Eta3.pass(rejRatios[0][3]) : pion_rejection_E18_Eta3.fail(rejRatios[0][3]);
// E, Eta = 10, 2
- eic::util::Test pion_rejection_E10_Eta2{
+ common_bench::Test pion_rejection_E10_Eta2{
{{"name", fmt::format("{}_E{}_EtaBin{}", test_tag, (int)E[1], 2)},
{"title", "Pion Rejection"},
{"description", fmt::format("Pion rejection with E = {}, and {}", (int)E[1], etaTitle[2])},
@@ -645,7 +645,7 @@ void emcal_barrel_pion_rejection_analysis(
suppression * maxRate[1][2] >= rejRatios[1][2] ? pion_rejection_E10_Eta2.pass(rejRatios[1][2]) : pion_rejection_E10_Eta2.fail(rejRatios[1][2]);
// E, Eta = 10, 3
- eic::util::Test pion_rejection_E10_Eta3{
+ common_bench::Test pion_rejection_E10_Eta3{
{{"name", fmt::format("{}_E{}_EtaBin{}", test_tag, (int)E[1], 3)},
{"title", "Pion Rejection"},
{"description", fmt::format("Pion rejection with E = {}, and {}", (int)E[1], etaTitle[3])},
@@ -658,7 +658,7 @@ void emcal_barrel_pion_rejection_analysis(
suppression * maxRate[1][3] >= rejRatios[1][3] ? pion_rejection_E10_Eta3.pass(rejRatios[1][3]) : pion_rejection_E10_Eta3.fail(rejRatios[1][3]);
// E, Eta = 5, 2
- eic::util::Test pion_rejection_E5_Eta2{
+ common_bench::Test pion_rejection_E5_Eta2{
{{"name", fmt::format("{}_E{}_EtaBin{}", test_tag, (int)E[2], 2)},
{"title", "Pion Rejection"},
{"description", fmt::format("Pion rejection with E = {}, and {}", (int)E[2], etaTitle[2])},
@@ -672,7 +672,7 @@ void emcal_barrel_pion_rejection_analysis(
suppression * maxRate[2][2] >= rejRatios[2][2] ? pion_rejection_E5_Eta2.pass(rejRatios[2][2]) : pion_rejection_E5_Eta2.fail(rejRatios[2][2]);
// E, Eta = 5, 3
- eic::util::Test pion_rejection_E5_Eta3{
+ common_bench::Test pion_rejection_E5_Eta3{
{{"name", fmt::format("{}_E{}_EtaBin{}", test_tag, (int)E[2], 3)},
{"title", "Pion Rejection"},
{"description", fmt::format("Pion rejection with E = {}, and {}", (int)E[2], etaTitle[3])},
@@ -686,7 +686,7 @@ void emcal_barrel_pion_rejection_analysis(
suppression * maxRate[2][3] >= rejRatios[2][3] ? pion_rejection_E5_Eta3.pass(rejRatios[2][3]) : pion_rejection_E5_Eta3.fail(rejRatios[2][3]);
// Writing out all tests
- eic::util::write_test({pion_rejection_E18_Eta2,
+ common_bench::write_test({pion_rejection_E18_Eta2,
pion_rejection_E18_Eta3,
pion_rejection_E10_Eta2,
pion_rejection_E10_Eta3,
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx
index 343eb26c..92c83bc8 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx
@@ -9,9 +9,9 @@
#include "dd4pod/Geant4ParticleCollection.h"
#include "dd4pod/CalorimeterHitCollection.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 "TCanvas.h"
#include "TStyle.h"
--
GitLab