From 2ab7c583797bd48944a60cd0c65adebd9eae4d67 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 5 Jul 2022 19:40:46 +0000
Subject: [PATCH] Rename synchroton to general backgrounds
---
.gitlab-ci.yml | 8 ++++++--
.../analysis/synchrotron_raw.cxx | 0
.../analysis/synchrotron_sim.cxx | 0
benchmarks/backgrounds/config.yml | 20 +++++++++++++++++++
.../synchrotron.sh | 0
benchmarks/single/config.yml | 6 ++++++
benchmarks/synchrotron/config.yml | 20 -------------------
7 files changed, 32 insertions(+), 22 deletions(-)
rename benchmarks/{synchrotron => backgrounds}/analysis/synchrotron_raw.cxx (100%)
rename benchmarks/{synchrotron => backgrounds}/analysis/synchrotron_sim.cxx (100%)
create mode 100644 benchmarks/backgrounds/config.yml
rename benchmarks/{synchrotron => backgrounds}/synchrotron.sh (100%)
delete mode 100644 benchmarks/synchrotron/config.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46cbc369..9c3c004e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,13 +81,17 @@ include:
- local: 'benchmarks/tcs/config.yml'
- local: 'benchmarks/u_omega/config.yml'
- local: 'benchmarks/single/config.yml'
- - local: 'benchmarks/synchrotron/config.yml'
+ - local: 'benchmarks/backgrounds/config.yml'
summary:
stage: finish
- #needs: ["dis:results", "dvcs:results", "dvmp:results"]
needs:
+ - "dis:results"
- "dvcs:results"
+ - "tcs:results"
+ - "u_omega:results"
+ - "single:results"
+ - "backgrounds:results"
script:
- collect_benchmarks.py
artifacts:
diff --git a/benchmarks/synchrotron/analysis/synchrotron_raw.cxx b/benchmarks/backgrounds/analysis/synchrotron_raw.cxx
similarity index 100%
rename from benchmarks/synchrotron/analysis/synchrotron_raw.cxx
rename to benchmarks/backgrounds/analysis/synchrotron_raw.cxx
diff --git a/benchmarks/synchrotron/analysis/synchrotron_sim.cxx b/benchmarks/backgrounds/analysis/synchrotron_sim.cxx
similarity index 100%
rename from benchmarks/synchrotron/analysis/synchrotron_sim.cxx
rename to benchmarks/backgrounds/analysis/synchrotron_sim.cxx
diff --git a/benchmarks/backgrounds/config.yml b/benchmarks/backgrounds/config.yml
new file mode 100644
index 00000000..6ba24885
--- /dev/null
+++ b/benchmarks/backgrounds/config.yml
@@ -0,0 +1,20 @@
+backgrounds:compile:
+ stage: compile
+ extends: .compile_benchmark
+ script:
+ - compile_analyses.py backgrounds
+
+backgrounds:synchrotron:simulate:
+ stage: simulate
+ extends: .phy_benchmark
+ tags:
+ - s3
+ needs: ["common:detector", "backgrounds:compile"]
+ script:
+ - bash benchmarks/backgrounds/synchrotron.sh --all
+
+backgrounds:results:
+ stage: collect
+ needs: ["backgrounds:synchrotron:simulate"]
+ script:
+ - ls -lrth
diff --git a/benchmarks/synchrotron/synchrotron.sh b/benchmarks/backgrounds/synchrotron.sh
similarity index 100%
rename from benchmarks/synchrotron/synchrotron.sh
rename to benchmarks/backgrounds/synchrotron.sh
diff --git a/benchmarks/single/config.yml b/benchmarks/single/config.yml
index 291bdeb5..4d3a8d4a 100644
--- a/benchmarks/single/config.yml
+++ b/benchmarks/single/config.yml
@@ -27,3 +27,9 @@ single:analyze:
needs: ["single:reconstruct", "single:compile"]
script:
- bash benchmarks/single/analyze.sh e-_1GeV_45to135deg
+
+single:results:
+ stage: collect
+ needs: ["single:analyze"]
+ script:
+ - ls -al
diff --git a/benchmarks/synchrotron/config.yml b/benchmarks/synchrotron/config.yml
deleted file mode 100644
index f1664212..00000000
--- a/benchmarks/synchrotron/config.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-synchrotron:compile:
- stage: compile
- extends: .compile_benchmark
- script:
- - compile_analyses.py synchrotron
-
-synchrotron:simulate:
- stage: simulate
- extends: .phy_benchmark
- tags:
- - s3
- needs: ["common:detector", "synchrotron:compile"]
- script:
- - bash benchmarks/synchrotron/synchrotron.sh --all
-
-synchrotron:results:
- stage: collect
- needs: ["synchrotron:simulate"]
- script:
- - ls -lrth
--
GitLab