From 154f80f7d3f6c0e8a2de9f72a04434e5c2403688 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 22 Feb 2022 10:32:39 -0600
Subject: [PATCH] Use compile_analyses for all tracking benchmarks

---
 benchmarks/track_finding/config.yml         |  8 ++++++++
 benchmarks/track_finding/multiple_tracks.sh |  4 ++--
 benchmarks/track_fitting/config.yml         |  8 ++++++++
 benchmarks/track_fitting/single_tracks.sh   |  4 ++--
 benchmarks/tracking/config.yml              | 17 ++++++++++-------
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/benchmarks/track_finding/config.yml b/benchmarks/track_finding/config.yml
index a5c02901..29be4a8b 100644
--- a/benchmarks/track_finding/config.yml
+++ b/benchmarks/track_finding/config.yml
@@ -1,5 +1,13 @@
+track_finding:compile:
+  extends: .compile_benchmark
+  stage: compile
+  script:
+    - compile_analyses.py --dir scripts track_finding
+
 track_finding:multiple_tracks:
   extends: .rec_benchmark
+  needs:
+    - ["track_finding:compile"]
   stage: run
   timeout: 24 hours
   script:
diff --git a/benchmarks/track_finding/multiple_tracks.sh b/benchmarks/track_finding/multiple_tracks.sh
index 67ef180e..914df3b1 100644
--- a/benchmarks/track_finding/multiple_tracks.sh
+++ b/benchmarks/track_finding/multiple_tracks.sh
@@ -55,7 +55,7 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 ## generate the input events
-root -b -q "benchmarks/track_finding/scripts/gen_multiple_tracks.cxx(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/track_finding/scripts/gen_multiple_tracks.cxx+(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script"
   exit 1
@@ -92,7 +92,7 @@ rootls -t ${JUGGLER_REC_FILE}
 
 mkdir -p results/track_finding
 
-root -b -q "benchmarks/track_finding/scripts/rec_multiple_tracks.cxx(\"${JUGGLER_REC_FILE}\")"
+root -b -q "benchmarks/track_finding/scripts/rec_multiple_tracks.cxx+(\"${JUGGLER_REC_FILE}\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running root script"
   exit 1
diff --git a/benchmarks/track_fitting/config.yml b/benchmarks/track_fitting/config.yml
index 2363c6a7..30a6b75c 100644
--- a/benchmarks/track_fitting/config.yml
+++ b/benchmarks/track_fitting/config.yml
@@ -1,6 +1,14 @@
+track_fitting:compile:
+  extends: .compile_benchmark
+  stage: compile
+  script:
+    - compile_analyses.py --dir scripts track_fitting
+
 track_fitting:single_tracks:
   extends: .rec_benchmark
   stage: run
+  needs:
+    - ["track_fitting:compile"]
   script:
     - bash benchmarks/track_fitting/single_tracks.sh
       
diff --git a/benchmarks/track_fitting/single_tracks.sh b/benchmarks/track_fitting/single_tracks.sh
index e5f3313a..19d166fa 100644
--- a/benchmarks/track_fitting/single_tracks.sh
+++ b/benchmarks/track_fitting/single_tracks.sh
@@ -58,7 +58,7 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 ## generate the input events
-root -b -q "benchmarks/track_fitting/scripts/gen_single_tracks.cxx(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/track_fitting/scripts/gen_single_tracks.cxx+(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script"
   exit 1
@@ -96,7 +96,7 @@ rootls -t  ${JUGGLER_REC_FILE}
 
 mkdir -p results/track_fitting
 
-root -b -q "benchmarks/track_fitting/scripts/rec_single_tracks.cxx(\"${JUGGLER_REC_FILE}\")"
+root -b -q "benchmarks/track_fitting/scripts/rec_single_tracks.cxx+(\"${JUGGLER_REC_FILE}\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running root script"
   exit 1
diff --git a/benchmarks/tracking/config.yml b/benchmarks/tracking/config.yml
index da8e48ba..796a6f7e 100644
--- a/benchmarks/tracking/config.yml
+++ b/benchmarks/tracking/config.yml
@@ -7,36 +7,39 @@ tracking_compile:
 tracking_central_electrons:
   extends: .rec_benchmark
   stage: run
-  timeout: 24 hours
+  needs:
+    - ["tracking_compile"]
   script:
     - bash benchmarks/tracking/central_electrons.sh
-      #allow_failure: true
       
 multiple_tracks:
   extends: .rec_benchmark
   stage: run
-  timeout: 24 hours
+  needs:
+    - ["tracking_compile"]
   script:
     - bash benchmarks/tracking/multiple_tracks.sh
 
 tracking_central_pions:
   extends: .rec_benchmark
   stage: run
-  timeout: 24 hours
+  needs:
+    - ["tracking_compile"]
   script:
     - bash benchmarks/tracking/central_pions.sh
-      #allow_failure: true
 
 tracking_truth_init_electrons:
   extends: .rec_benchmark
   stage: run
-  timeout: 24 hours
+  needs:
+    - ["tracking_compile"]
   script:
     - python benchmarks/tracking/run_tracking_benchmarks.py --nametag=truth_electron --particle=electron --etamin=-4 --etamax=4 -n 150
 
 tracking_truth_init_pions:
   extends: .rec_benchmark
   stage: run
-  timeout: 24 hours
+  needs:
+    - ["tracking_compile"]
   script:
     - python benchmarks/tracking/run_tracking_benchmarks.py --nametag=truth_pion --particle=pion+ --etamin=-4 --etamax=4 -n 150
-- 
GitLab