diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b77aaf45eafd26a9a7f7006014afa68de4215681..0e632e59e78b0f38098658e1dfcb253616efe287 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ common:detector: - ln -s "${LOCAL_DATA_PATH}/datasets/data" data - ls -lrtha - curl -sL https://eicweb.phy.anl.gov/EIC/benchmarks/detector_benchmarks/-/jobs/artifacts/master/raw/results/emcal_barrel_calibration.json?job=collect_results:barrel_ecal --output config/emcal_barrel_calibration.json - # - ls -lhtR sim_output/ + - ls -lhtR sim_output/ interruptible: true include: diff --git a/benchmarks/imaging_ecal/config.yml b/benchmarks/imaging_ecal/config.yml index 1b319ea02f9c8222ac44680851fc0bc054168fbe..b277b997356a1e7e24d055e0ce150c2fdcf3c586 100644 --- a/benchmarks/imaging_ecal/config.yml +++ b/benchmarks/imaging_ecal/config.yml @@ -30,8 +30,8 @@ imaging_ecal_energy_scan: extends: .rec_benchmark stage: run timeout: 24 hours - rules: - - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"' + # rules: + # - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"' script: - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 100 -p "${PARTICLE}" -e "${ENERGY}" parallel: @@ -39,18 +39,18 @@ imaging_ecal_energy_scan: - ENERGY: ["1", "2", "5"] PARTICLE: [electron, photon] -# imaging_ecal_energy_scan_analysis: -# extends: .rec_benchmark -# stage: process -# timeout: 24 hours -# # rules: -# # - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"' -# needs: -# - ["imaging_ecal_energy_scan"] -# script: -# - ls -lhtR sim_output/ -# - rootls -t sim_output/rec_emcal_barrel_photon_5.root -# # - root -b -q 'benchmarks/imaging_ecal/scripts/energy_scan_analysis.cxx+' +imaging_ecal_energy_scan_analysis: + extends: .rec_benchmark + stage: process + timeout: 24 hours + # rules: + # - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"' + needs: + - ["imaging_ecal_energy_scan"] + script: + - ls -lhtR sim_output/ + - rootls -t sim_output/rec_emcal_barrel_photon_5.root + - root -b -q 'benchmarks/imaging_ecal/scripts/energy_scan_analysis.cxx+' imaging_ecal:results: diff --git a/benchmarks/imaging_ecal/run_emcal_barrel.sh b/benchmarks/imaging_ecal/run_emcal_barrel.sh index 954ab12164d6f8f49eae93962ab73557d5afabbb..d12837ed030e01e460eda0ec6bef2bd59b97130a 100644 --- a/benchmarks/imaging_ecal/run_emcal_barrel.sh +++ b/benchmarks/imaging_ecal/run_emcal_barrel.sh @@ -163,4 +163,4 @@ if [[ "${CB_EMCAL_NUMEV}" -lt "500" ]] ; then cp ${CB_EMCAL_REC_FILE} results/. fi fi -# cp ${CB_EMCAL_REC_FILE} sim_output/. +cp ${CB_EMCAL_REC_FILE} sim_output/.