From 20601e6528fda00d30095d1c7986d23f9903a1f8 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wouter.deconinck@umanitoba.ca>
Date: Fri, 8 Oct 2021 16:00:13 +0000
Subject: [PATCH] scripts -> anaysis, pre-compile
---
benchmarks/dvcs/{scripts => analysis}/dvcs_ps_gen.cxx | 0
benchmarks/dvcs/{scripts => analysis}/dvcs_tests.cxx | 0
benchmarks/dvcs/config.yml | 1 +
benchmarks/dvcs/dvcs.sh | 2 +-
benchmarks/single/config.yml | 1 +
benchmarks/u_omega/{scripts => analysis}/demo.cxx | 0
benchmarks/u_omega/config.yml | 1 +
benchmarks/u_omega/u_omega.sh | 2 +-
8 files changed, 5 insertions(+), 2 deletions(-)
rename benchmarks/dvcs/{scripts => analysis}/dvcs_ps_gen.cxx (100%)
rename benchmarks/dvcs/{scripts => analysis}/dvcs_tests.cxx (100%)
rename benchmarks/u_omega/{scripts => analysis}/demo.cxx (100%)
diff --git a/benchmarks/dvcs/scripts/dvcs_ps_gen.cxx b/benchmarks/dvcs/analysis/dvcs_ps_gen.cxx
similarity index 100%
rename from benchmarks/dvcs/scripts/dvcs_ps_gen.cxx
rename to benchmarks/dvcs/analysis/dvcs_ps_gen.cxx
diff --git a/benchmarks/dvcs/scripts/dvcs_tests.cxx b/benchmarks/dvcs/analysis/dvcs_tests.cxx
similarity index 100%
rename from benchmarks/dvcs/scripts/dvcs_tests.cxx
rename to benchmarks/dvcs/analysis/dvcs_tests.cxx
diff --git a/benchmarks/dvcs/config.yml b/benchmarks/dvcs/config.yml
index ee77a0f3..9b00dfeb 100644
--- a/benchmarks/dvcs/config.yml
+++ b/benchmarks/dvcs/config.yml
@@ -5,6 +5,7 @@ dvcs:process:
- s3
needs: ["common:detector"]
script:
+ - compile_analyses.py dvcs
- bash benchmarks/dvcs/dvcs.sh --all
dvcs:results:
diff --git a/benchmarks/dvcs/dvcs.sh b/benchmarks/dvcs/dvcs.sh
index 7a47ac14..c05c3486 100644
--- a/benchmarks/dvcs/dvcs.sh
+++ b/benchmarks/dvcs/dvcs.sh
@@ -145,7 +145,7 @@ if [[ -n "${DO_ANALYSIS}" || -n "${DO_ALL}" ]] ; then
mkdir -p results/dvcs
# here you can add as many scripts as you want.
- root -b -q "benchmarks/dvcs/scripts/dvcs_tests.cxx(\"${JUGGLER_REC_FILE}\")"
+ root -b -q "benchmarks/dvcs/analysis/dvcs_tests.cxx+(\"${JUGGLER_REC_FILE}\")"
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running root script"
exit 1
diff --git a/benchmarks/single/config.yml b/benchmarks/single/config.yml
index 35ed2a0d..a84da3f8 100644
--- a/benchmarks/single/config.yml
+++ b/benchmarks/single/config.yml
@@ -3,4 +3,5 @@ single:process:
timeout: 24 hours
stage: process
script:
+ - compile_analyses.py single
- bash benchmarks/single/single.sh e-_1GeV_45to135deg
diff --git a/benchmarks/u_omega/scripts/demo.cxx b/benchmarks/u_omega/analysis/demo.cxx
similarity index 100%
rename from benchmarks/u_omega/scripts/demo.cxx
rename to benchmarks/u_omega/analysis/demo.cxx
diff --git a/benchmarks/u_omega/config.yml b/benchmarks/u_omega/config.yml
index 9e4925b6..8dacd4bd 100644
--- a/benchmarks/u_omega/config.yml
+++ b/benchmarks/u_omega/config.yml
@@ -5,6 +5,7 @@ u_omega:process:
- s3
needs: ["common:detector"]
script:
+ - compile_analysis.py u_omega
- bash benchmarks/u_omega/u_omega.sh --all
u_omega:results:
diff --git a/benchmarks/u_omega/u_omega.sh b/benchmarks/u_omega/u_omega.sh
index 6d051589..23bbf403 100644
--- a/benchmarks/u_omega/u_omega.sh
+++ b/benchmarks/u_omega/u_omega.sh
@@ -144,7 +144,7 @@ if [[ -n "${DO_ANALYSIS}" || -n "${DO_ALL}" ]] ; then
mkdir -p "results/${FILE_NAME_TAG}"
# here you can add as many scripts as you want.
- root -b -q "benchmarks/${FILE_NAME_TAG}/scripts/demo.cxx(\"${JUGGLER_REC_FILE}\")"
+ root -b -q "benchmarks/${FILE_NAME_TAG}/analysis/demo.cxx+(\"${JUGGLER_REC_FILE}\")"
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running root script"
exit 1
--
GitLab