From f85411c90bb40c583ce933524a2f813b47499e20 Mon Sep 17 00:00:00 2001
From: Domenico Giordano <domenico.giordano@cern.ch>
Date: Thu, 19 May 2022 19:52:12 +0200
Subject: [PATCH] include whole nightly build to test reco

---
 alice/gen-sim-reco-run3/alice-gen-sim-reco-run3.spec            | 2 +-
 .../alice-gen-sim-reco-run3/alice-gen-sim-reco-run3-bmk.sh      | 2 +-
 .../jobs/good_1/alice-gen-sim-reco-run3_summary.json            | 2 +-
 alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/parseResults.sh | 2 +-
 alice/gen-sim-reco-run3/alice_spec_custom.txt                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3.spec b/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3.spec
index 5ca935cd..62a67a4b 100644
--- a/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3.spec
+++ b/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3.spec
@@ -3,7 +3,7 @@ HEPWL_BMKOPTS="-t 2 -c 1 -e 2 -m none"
 HEPWL_BMKDIR=alice-gen-sim-reco-run3
 HEPWL_BMKDESCRIPTION="ALICE pp GEN-SIM"
 HEPWL_DOCKERIMAGENAME=alice-gen-sim-reco-run3-bmk
-HEPWL_DOCKERIMAGETAG=v0.4
+HEPWL_DOCKERIMAGETAG=ci-v0.5-aod
 HEPWL_CVMFSREPOS=alice.cern.ch
 HEPWL_BMKOS="gitlab-registry.cern.ch/linuxsupport/cc7-base:20211101-1.x86_64"
 HEPWL_EXTEND_ALICE_SPEC=./alice_spec_custom.txt
diff --git a/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/alice-gen-sim-reco-run3-bmk.sh b/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/alice-gen-sim-reco-run3-bmk.sh
index f33fb45f..8756abbe 100755
--- a/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/alice-gen-sim-reco-run3-bmk.sh
+++ b/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/alice-gen-sim-reco-run3-bmk.sh
@@ -62,7 +62,7 @@ function doOne(){
   cp ${HEPSCORE_CCDB_ROOT}/data/matbud.root .
   
   # run workflow
-  ${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow.json --cpu-limit ${CPULIMIT} -tt sgn >> out_$1.log 2>&1
+  ${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow.json --cpu-limit ${CPULIMIT} -tt aod >> out_$1.log 2>&1
   status=${?}
   echo "[doOne ($1)] $(date) completed (status=$status)"
   # Return 0 if this workload copy was successful, 1 otherwise
diff --git a/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/jobs/good_1/alice-gen-sim-reco-run3_summary.json b/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/jobs/good_1/alice-gen-sim-reco-run3_summary.json
index 9c608cb2..082c08c4 100755
--- a/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/jobs/good_1/alice-gen-sim-reco-run3_summary.json
+++ b/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/jobs/good_1/alice-gen-sim-reco-run3_summary.json
@@ -6,7 +6,7 @@
   },
   "report": {
     "wl-scores": {
-      "gen-sim": 0.00392927
+      "gen-sim-digi-reco": 0.00392927
     },
     "wl-stats": {
       "avg": 0.00392927,
diff --git a/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/parseResults.sh b/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/parseResults.sh
index a8569ddc..cd4d7378 100644
--- a/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/parseResults.sh
+++ b/alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/parseResults.sh
@@ -26,7 +26,7 @@ function parseResults(){
       } else {
         median=(a[(n / 2)] + a[(n / 2) + 1]) / 2.0;
       }; 
-printf "\"wl-scores\": {\"gen-sim\": %.8f} , \"wl-stats\": {\"avg\": %.8f, \"median\": %.8f, \"min\": %.8f, \"max\": %.8f, \"count\": %d}",
+printf "\"wl-scores\": {\"gen-sim-digi-reco\": %.8f} , \"wl-stats\": {\"avg\": %.8f, \"median\": %.8f, \"min\": %.8f, \"max\": %.8f, \"count\": %d}",
 sum, sum/count, median, amin, amax, count
     }' || (echo "\"wl-scores\":{}"; exit 1)`
   STATUS=$?
diff --git a/alice/gen-sim-reco-run3/alice_spec_custom.txt b/alice/gen-sim-reco-run3/alice_spec_custom.txt
index 5397826a..973d0c94 100644
--- a/alice/gen-sim-reco-run3/alice_spec_custom.txt
+++ b/alice/gen-sim-reco-run3/alice_spec_custom.txt
@@ -1 +1 @@
-/el7-x86_64/Packages/O2/nightly-20220421-1/share/Detectors/TPC/files/*
+/el7-x86_64/Packages/O2/nightly-20220421-1/*
-- 
GitLab