Rename stage process to simulate, reconstruct, analyze

.gitlab-ci.yml

@@ -25,7 +25,9 @@ stages:
   - initialize
   - compile
   - generate
-  - process
+  - simulate
+  - reconstruct
+  - analyze
   - collect
   - finish
 

benchmarks/dis/config.yml

@@ -20,8 +20,8 @@ dis:generate:
   script:
     - bash benchmarks/dis/get.sh --config dis_${EBEAM}x${PBEAM} --ebeam ${EBEAM} --pbeam ${PBEAM}
 
-dis:process:
-  stage: process
+dis:simulate:
+  stage: simulate
   extends: .phy_benchmark
   needs: ["dis:generate"]
   parallel:
@@ -42,6 +42,6 @@ dis:process:
 
 dis:results:
   stage: collect
-  needs: ["dis:process"]
+  needs: ["dis:simulate"]
   script:
     - collect_tests.py dis

benchmarks/dvcs/config.yml

@@ -4,8 +4,8 @@ dvcs:compile:
   script:
     - compile_analyses.py dvcs
 
-dvcs:process:
-  stage: process
+dvcs:simulate:
+  stage: simulate
   extends: .phy_benchmark
   tags:
     - phy
@@ -16,7 +16,7 @@ dvcs:process:
 
 dvcs:results:
   stage: collect
-  needs: ["dvcs:process"]
+  needs: ["dvcs:simulate"]
   script:
     - ls -lrth
       #pip install junitparser

benchmarks/dvmp/config.yml

@@ -17,8 +17,8 @@ dvmp:generate:
           --decay muon --decay electron
           --nproc 5
 
-dvmp:process:
-  stage: process
+dvmp:simulate:
+  stage: simulate
   extends: .phy_benchmark
   needs: ["dvmp:generate"]
   timeout: 2 hour
@@ -37,6 +37,6 @@ dvmp:process:
 
 dvmp:results:
   stage: collect
-  needs: ["dvmp:process"]
+  needs: ["dvmp:simulate"]
   script:
     - collect_tests.py dvmp

benchmarks/single/analyze.sh

+#!/bin/bash
+
+source $(dirname $0)/common.sh $*
+
+# Analyze
+root -l -b -q "benchmarks/single/analysis/analyze.cxx+(\"${JUGGLER_REC_FILE}\")"
+if [[ "$?" -ne "0" ]] ; then
+  echo "ERROR analysis failed"
+  exit 1
+fi

benchmarks/single/common.sh

+if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
+  export JUGGLER_N_EVENTS=100
+fi
+
+export JUGGLER_FILE_NAME_TAG="${1:-e-_1GeV_45to135deg}"
+export JUGGLER_GEN_FILE="benchmarks/single/${JUGGLER_FILE_NAME_TAG}.steer"
+export JUGGLER_SIM_FILE="sim_output/sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
+export JUGGLER_REC_FILE="sim_output/rec_${JUGGLER_FILE_NAME_TAG}.root"

benchmarks/single/config.yml

@@ -4,10 +4,26 @@ single:compile:
   script:
     - compile_analyses.py single
 
-single:process:
+single:simulate:
   extends: .phy_benchmark
-  timeout: 24 hours
-  stage: process
-  needs: ["common:detector", "single:compile"]
+  timeout: 2 hours
+  stage: simulate
+  needs: ["common:detector"]
   script:
-    - bash benchmarks/single/single.sh e-_1GeV_45to135deg
+    - bash benchmarks/single/simulate.sh e-_1GeV_45to135deg
+
+single:reconstruct:
+  extends: .phy_benchmark
+  timeout: 2 hours
+  stage: reconstruct
+  needs: ["single:simulate"]
+  script:
+    - bash benchmarks/single/reconstruct.sh e-_1GeV_45to135deg
+
+single:analyze:
+  extends: .phy_benchmark
+  timeout: 2 hours
+  stage: analyze
+  needs: ["single:reconstruct", "single:compile"]
+  script:
+    - bash benchmarks/single/analyze.sh e-_1GeV_45to135deg

benchmarks/single/reconstruct.sh

+#!/bin/bash
+
+source $(dirname $0)/common.sh $*
+
+# Reconstruct
+for rec in options/*.py ; do
+  unset tag
+  [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
+  JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
+    gaudirun.py ${JUGGLER_GAUDI_OPTIONS:-} ${rec}
+  if [[ "$?" -ne "0" ]] ; then
+    echo "ERROR running juggler"
+    exit 1
+  fi
+done

benchmarks/single/single.sh → benchmarks/single/simulate.sh

 #!/bin/bash
 
-if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
-  export JUGGLER_N_EVENTS=100
-fi
-
-export JUGGLER_FILE_NAME_TAG="${1:-e-_1GeV_45to135deg}"
-export JUGGLER_GEN_FILE="benchmarks/single/${JUGGLER_FILE_NAME_TAG}.steer"
-export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
-export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
+source $(dirname $0)/common.sh $*
 
 # Simulate
 ddsim --runType run \
@@ -23,22 +16,3 @@ if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running ddsim"
   exit 1
 fi
-
-# Reconstruct
-for rec in options/*.py ; do
-  unset tag
-  [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
-  JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
-    gaudirun.py ${rec}
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
-    exit 1
-  fi
-done
-
-# Analysis
-root -l -b -q "benchmarks/single/analysis/analyze.cxx+(\"${JUGGLER_REC_FILE}\")"
-if [[ "$?" -ne "0" ]] ; then
-  echo "ERROR analysis failed"
-  exit 1
-fi

benchmarks/synchrotron/config.yml

@@ -4,8 +4,8 @@ synchrotron:compile:
   script:
     - compile_analyses.py synchrotron
 
-synchrotron:process:
-  stage: process
+synchrotron:simulate:
+  stage: simulate
   extends: .phy_benchmark
   tags:
     - s3
@@ -15,6 +15,6 @@ synchrotron:process:
 
 synchrotron:results:
   stage: collect
-  needs: ["synchrotron:process"]
+  needs: ["synchrotron:simulate"]
   script:
     - ls -lrth

benchmarks/tcs/config.yml

@@ -4,8 +4,8 @@ tcs:compile:
   script:
     - compile_analyses.py tcs
 
-tcs:process:
-  stage: process
+tcs:simulate:
+  stage: simulate
   extends: .phy_benchmark
   tags:
     - phy
@@ -27,6 +27,6 @@ tcs:process:
 
 tcs:results:
   stage: collect
-  needs: ["tcs:process"]
+  needs: ["tcs:simulate"]
   script:
     - ls -lrth

benchmarks/u_omega/config.yml

@@ -4,8 +4,8 @@ u_omega:compile:
   script:
     - compile_analyses.py u_omega
 
-u_omega:process:
-  stage: process
+u_omega:simulate:
+  stage: simulate
   extends: .phy_benchmark
   tags:
     - phy
@@ -16,6 +16,6 @@ u_omega:process:
 
 u_omega:results:
   stage: collect
-  needs: ["u_omega:process"]
+  needs: ["u_omega:simulate"]
   script:
     - ls -lrth