diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4d3d5ba6246b038763fc27a2199497d8682d109..5cc67e82feef9ada2f0daaa7d50fdb3d8a375cbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,11 @@
stages:
- check
+<<<<<<< HEAD
- test
+=======
+ # - test
+ - automated_test
+>>>>>>> test only manuanl automated test
.before_script: &before_script
before_script:
@@ -18,7 +23,6 @@ stages:
- python3 -m venv .venv --clear
- source .venv/bin/activate
- python3 -m pip install --upgrade pip setuptools wheel
-
checks:
stage: check
only: [merge_requests]
@@ -37,20 +41,22 @@ checks:
# Pass list of modified files to pre-commit so that it only checks them
- echo $FILES | xargs pre-commit run --color=always --files
-pytest:
- stage: test
- only: [merge_requests]
- <<: *before_script
- script:
- - export LANG=C # Hopefully detect anything relying on locale
- - python3 -m pip install ".[test]"
- - python3 -m pytest --color yes --verbose --cov=cal_tools --cov=xfel_calibrate
+
+#pytest:
+# stage: test
+# only: [merge_requests]
+# <<: *before_script
+# script:
+# - export LANG=C # Hopefully detect anything relying on locale
+ # - python3 -m pip install ".[test]"
+ # - python3 -m pytest --color yes --verbose --cov=cal_tools --cov=xfel_calibrate
# Nope... https://docs.gitlab.com/12.10/ee/user/project/merge_requests/test_coverage_visualization.html#enabling-the-feature
# - coverage xml
# artifacts:
# reports:
# cobertura: coverage.xml
+<<<<<<< HEAD
cython-editable-install-test:
stage: test
only: [merge_requests]
@@ -58,3 +64,26 @@ cython-editable-install-test:
script:
- python3 -m pip install -e ".[test]"
- python3 -m pytest --color yes --verbose ./tests/test_cythonalgs.py
+=======
+#cython-editable-install-test:
+# stage: test
+# only: [merge_requests]
+# <<: *before_script
+# script:
+ #- python3 -m pip install -e ".[test]"
+ # - python3 -m pytest --color yes --verbose ./tests/test_agipdalgs.py
+
+pytest:
+ variables:
+ REFERENCE_FOLDER: "/gpfs/exfel/data/scratch/xcaltst/test/"
+ OUT_FOLDER: "/gpfs/exfel/data/scratch/xcaltst/test/"
+ stage: automated_test
+ only: [merge_requests]
+ when: manual
+ allow_failure: true
+ <<: *before_script
+ script:
+ - export LANG=C # Hopefully detect anything relying on locale
+ - python3 -m pip install ".[test]"
+ - python3 -m pytest ./tests/test_reference_runs --color yes --verbose --release-test --reference-folder $REFERENCE_FOLDER --out-folder $OUT_FOLDER
+>>>>>>> test only manuanl automated test
diff --git a/tests/test_reference_runs/callab_tests.py b/tests/test_reference_runs/callab_tests.py
index 5a9454acb02ca60ac53d0afadfba5409e3edcfd3..bbf246e1ebb94d9506489fde119ff5b38fbc7deb 100644
--- a/tests/test_reference_runs/callab_tests.py
+++ b/tests/test_reference_runs/callab_tests.py
@@ -1,354 +1,354 @@
automated_test_config = {
- "SPB_DET_AGIPD1M-1-CORRECT-FIXED":
- {
- "det_type": "AGIPD",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw",
- "run": "95",
- "karabo-id-control": "SPB_IRU_AGIPD1M1",
- "karabo-id": "SPB_DET_AGIPD1M-1",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}"
- },
- "SPB_DET_AGIPD1M-1-DARK-FIXED":
- {
- "det_type": "AGIPD",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw",
- "run-high": "91",
- "run-med": "92",
- "run-low": "93",
- "karabo-id-control": "SPB_IRU_AGIPD1M1",
- "karabo-id": "SPB_DET_AGIPD1M-1",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}",
- },
- "SPB_DET_AGIPD1M-1-CORRECT-ADAPTIVE":{
- "det_type": "AGIPD",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw",
- "run": "262",
- "karabo-id-control": "SPB_IRU_AGIPD1M1",
- "karabo-id": "SPB_DET_AGIPD1M-1",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}",
- },
- "SPB_DET_AGIPD1M-1-DARK-ADAPTIVE":
- {
- "det_type": "AGIPD",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw",
- "run-high": "216",
- "run-med": "217",
- "run-low": "218",
- "karabo-id-control": "SPB_IRU_AGIPD1M1",
- "karabo-id": "SPB_DET_AGIPD1M-1",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}",
- },
+ # "SPB_DET_AGIPD1M-1-CORRECT-FIXED":
+ # {
+ # "det_type": "AGIPD",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw",
+ # "run": "95",
+ # "karabo-id-control": "SPB_IRU_AGIPD1M1",
+ # "karabo-id": "SPB_DET_AGIPD1M-1",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}"
+ # },
+ # "SPB_DET_AGIPD1M-1-DARK-FIXED":
+ # {
+ # "det_type": "AGIPD",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw",
+ # "run-high": "91",
+ # "run-med": "92",
+ # "run-low": "93",
+ # "karabo-id-control": "SPB_IRU_AGIPD1M1",
+ # "karabo-id": "SPB_DET_AGIPD1M-1",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "SPB_DET_AGIPD1M-1-CORRECT-ADAPTIVE":{
+ # "det_type": "AGIPD",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw",
+ # "run": "262",
+ # "karabo-id-control": "SPB_IRU_AGIPD1M1",
+ # "karabo-id": "SPB_DET_AGIPD1M-1",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "SPB_DET_AGIPD1M-1-DARK-ADAPTIVE":
+ # {
+ # "det_type": "AGIPD",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw",
+ # "run-high": "216",
+ # "run-med": "217",
+ # "run-low": "218",
+ # "karabo-id-control": "SPB_IRU_AGIPD1M1",
+ # "karabo-id": "SPB_DET_AGIPD1M-1",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
- "MID_DET_AGIPD1M-1-CORRECT-ADAPTIVE":
- {
- "det_type": "AGIPD",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw",
- "run": "21",
- "karabo-id-control": "MID_EXP_AGIPD1M1",
- "karabo-id": "MID_DET_AGIPD1M-1",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}",
- },
- "MID_DET_AGIPD1M-1-DARK-ADAPTIVE":
- {
- "det_type": "AGIPD",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw",
- "run-high": "4",
- "run-med": "5",
- "run-low": "6",
- "karabo-id-control": "MID_EXP_AGIPD1M1",
- "karabo-id": "MID_DET_AGIPD1M-1",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}",
- },
- "HED_DET_AGIPD500K2G-CORRECT-ADAPTIVE":
- {
- "det_type": "AGIPD",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/HED/202131/p900228/raw",
- "run": "29",
- "karabo-id-control": "HED_EXP_AGIPD500K2G",
- "karabo-id": "HED_DET_AGIPD500K2G",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}",
- },
- "HED_DET_AGIPD500K2G-DARK-ADAPTIVE":{
- "det_type": "AGIPD",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/HED/202131/p900228/raw",
- "run-high": "25",
- "run-med": "26",
- "run-low": "27",
- "karabo-id-control": "HED_EXP_AGIPD500K2G",
- "karabo-id": "HED_DET_AGIPD500K2G",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}",
- },
- "MID_DET_AGIPD1M-1-CORRECT-SELECT_CELLS_CM":
- {
- "det_type": "AGIPD",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw",
- "run": "21",
- "max-pulses": [0, 160, 2],
- "common-mode": True,
- "karabo-id-control": "MID_EXP_AGIPD1M1",
- "karabo-id": "MID_DET_AGIPD1M-1",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}",
- },
- "MID_DET_AGIPD1M-1-CORRECT-SELECT_CELLS_NOCM":
- {
- "det_type": "AGIPD",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw",
- "run": "21",
- "max-pulses": [0, 160, 2],
+ # "MID_DET_AGIPD1M-1-CORRECT-ADAPTIVE":
+ # {
+ # "det_type": "AGIPD",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw",
+ # "run": "21",
+ # "karabo-id-control": "MID_EXP_AGIPD1M1",
+ # "karabo-id": "MID_DET_AGIPD1M-1",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "MID_DET_AGIPD1M-1-DARK-ADAPTIVE":
+ # {
+ # "det_type": "AGIPD",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw",
+ # "run-high": "4",
+ # "run-med": "5",
+ # "run-low": "6",
+ # "karabo-id-control": "MID_EXP_AGIPD1M1",
+ # "karabo-id": "MID_DET_AGIPD1M-1",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "HED_DET_AGIPD500K2G-CORRECT-ADAPTIVE":
+ # {
+ # "det_type": "AGIPD",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/HED/202131/p900228/raw",
+ # "run": "29",
+ # "karabo-id-control": "HED_EXP_AGIPD500K2G",
+ # "karabo-id": "HED_DET_AGIPD500K2G",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "HED_DET_AGIPD500K2G-DARK-ADAPTIVE":{
+ # "det_type": "AGIPD",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/HED/202131/p900228/raw",
+ # "run-high": "25",
+ # "run-med": "26",
+ # "run-low": "27",
+ # "karabo-id-control": "HED_EXP_AGIPD500K2G",
+ # "karabo-id": "HED_DET_AGIPD500K2G",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "MID_DET_AGIPD1M-1-CORRECT-SELECT_CELLS_CM":
+ # {
+ # "det_type": "AGIPD",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw",
+ # "run": "21",
+ # "max-pulses": [0, 160, 2],
+ # "common-mode": True,
+ # "karabo-id-control": "MID_EXP_AGIPD1M1",
+ # "karabo-id": "MID_DET_AGIPD1M-1",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "MID_DET_AGIPD1M-1-CORRECT-SELECT_CELLS_NOCM":
+ # {
+ # "det_type": "AGIPD",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw",
+ # "run": "21",
+ # "max-pulses": [0, 160, 2],
- "no-common-mode": True,
- "karabo-id-control": "MID_EXP_AGIPD1M1",
- "karabo-id": "MID_DET_AGIPD1M-1",
- "slurm-mem": "750",
- "ctrl-source-template": "{}/MDL/FPGA_COMP",
- },
- "reference-folder": "{}/{}/{}",
- },
- "FXE_XAD_JF500K-DARK-SINGLE":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/FXE/202101/p002478/raw/",
- "run-high": "47",
- "run-med": "48",
- "run-low": "49",
- "karabo-id-control": "",
- "karabo-id": "FXE_XAD_JF500K",
- "karabo-da": "JNGFR03",
- },
- "reference-folder": "{}/{}/{}",
- },
- "FXE_XAD_JF500K-CORRECT-SINGLE":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/FXE/202101/p002478/raw/",
- "run": "52",
- "karabo-id-control": "",
- "karabo-id": "FXE_XAD_JF500K",
- "karabo-da": "JNGFR03",
- },
- "reference-folder": "{}/{}/{}",
- },
- "FXE_XAD_JF1M-DARK-BURST":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/FXE/202131/p900226/raw/",
- "run-high": "108",
- "run-med": "109",
- "run-low": "110",
- "karabo-id-control": "",
- "karabo-id": "FXE_XAD_JF1M",
- "karabo-da": ["JNGFR01", "JNGFR02"],
- },
- "reference-folder": "{}/{}/{}",
- },
- "FXE_XAD_JF1M-CORRECT-BURST":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/FXE/202131/p900226/raw",
- "run": "106",
- "karabo-id-control": "",
- "karabo-id": "FXE_XAD_JF1M",
- "karabo-da": ["JNGFR01", "JNGFR02"],
- },
- "reference-folder": "{}/{}/{}",
- },
- "FXE_XAD_JF1M-DARK-SINGLE":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/FXE/202101/p002478/raw/",
- "run-high": "47",
- "run-med": "48",
- "run-low": "49",
- "karabo-id-control": "",
- "karabo-id": "FXE_XAD_JF1M",
- "karabo-da": ["JNGFR01", "JNGFR02"],
- },
- "reference-folder": "{}/{}/{}",
- },
- "FXE_XAD_JF1M-CORRECT-SINGLE":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/FXE/202101/p002478/raw/",
- "run": "52",
- "karabo-id-control": "",
- "karabo-id": "FXE_XAD_JF1M",
- "karabo-da": ["JNGFR01", "JNGFR02"],
- },
- "reference-folder": "{}/{}/{}",
- },
- "SPB_IRDA_JF4M-CORRECT-SINGLE":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/SPB/202130/p900204/raw",
- "run": "91",
- "karabo-id-control": "",
- "karabo-id": "SPB_IRDA_JF4M",
- "karabo-da": [
- "JNGFR01", "JNGFR02", "JNGFR03", "JNGFR04",
- "JNGFR05", "JNGFR06", "JNGFR07", "JNGFR08"
- ],
- },
- "reference-folder": "{}/{}/{}",
- },
- "SPB_IRDA_JF4M-DARK-ADAPTIVE":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/SPB/202130/p900204/raw",
- "run-high": "88",
- "run-med": "89",
- "run-low": "90",
- "karabo-id-control": "",
- "karabo-id": "SPB_IRDA_JF4M",
- "karabo-da": [
- "JNGFR01", "JNGFR02", "JNGFR03", "JNGFR04",
- "JNGFR05", "JNGFR06", "JNGFR07", "JNGFR08"
- ],
- },
- "reference-folder": "{}/{}/{}",
- },
- "HED_IA1_JF500K1-CORRECT-ADAPTIVE":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw",
- "run": "230",
- "karabo-id": "HED_IA1_JF500K1",
- "karabo-da": "JNGFR01",
- },
- "reference-folder": "{}/{}/{}",
- },
- "HED_IA1_JF500K1-DARK-ADAPTIVE":
- {
- "det_type": "JUNGFRAU",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw",
- "run-high": "219",
- "run-med": "220",
- "run-low": "221",
- "karabo-id": "HED_IA1_JF500K1",
- "karabo-da": "JNGFR01",
- },
- "reference-folder": "{}/{}/{}",
- },
- "HED_IA1_EPX100-1-CORRECT":
- {
- "det_type": "EPIX100",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw",
- "run": "230",
- "karabo-id": "HED_IA1_EPX100-1",
- "karabo-da": "EPIX01",
- },
- "reference-folder": "{}/{}/{}",
- },
+ # "no-common-mode": True,
+ # "karabo-id-control": "MID_EXP_AGIPD1M1",
+ # "karabo-id": "MID_DET_AGIPD1M-1",
+ # "slurm-mem": "750",
+ # "ctrl-source-template": "{}/MDL/FPGA_COMP",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "FXE_XAD_JF500K-DARK-SINGLE":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/FXE/202101/p002478/raw/",
+ # "run-high": "47",
+ # "run-med": "48",
+ # "run-low": "49",
+ # "karabo-id-control": "",
+ # "karabo-id": "FXE_XAD_JF500K",
+ # "karabo-da": "JNGFR03",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "FXE_XAD_JF500K-CORRECT-SINGLE":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/FXE/202101/p002478/raw/",
+ # "run": "52",
+ # "karabo-id-control": "",
+ # "karabo-id": "FXE_XAD_JF500K",
+ # "karabo-da": "JNGFR03",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "FXE_XAD_JF1M-DARK-BURST":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/FXE/202131/p900226/raw/",
+ # "run-high": "108",
+ # "run-med": "109",
+ # "run-low": "110",
+ # "karabo-id-control": "",
+ # "karabo-id": "FXE_XAD_JF1M",
+ # "karabo-da": ["JNGFR01", "JNGFR02"],
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "FXE_XAD_JF1M-CORRECT-BURST":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/FXE/202131/p900226/raw",
+ # "run": "106",
+ # "karabo-id-control": "",
+ # "karabo-id": "FXE_XAD_JF1M",
+ # "karabo-da": ["JNGFR01", "JNGFR02"],
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "FXE_XAD_JF1M-DARK-SINGLE":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/FXE/202101/p002478/raw/",
+ # "run-high": "47",
+ # "run-med": "48",
+ # "run-low": "49",
+ # "karabo-id-control": "",
+ # "karabo-id": "FXE_XAD_JF1M",
+ # "karabo-da": ["JNGFR01", "JNGFR02"],
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "FXE_XAD_JF1M-CORRECT-SINGLE":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/FXE/202101/p002478/raw/",
+ # "run": "52",
+ # "karabo-id-control": "",
+ # "karabo-id": "FXE_XAD_JF1M",
+ # "karabo-da": ["JNGFR01", "JNGFR02"],
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "SPB_IRDA_JF4M-CORRECT-SINGLE":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/SPB/202130/p900204/raw",
+ # "run": "91",
+ # "karabo-id-control": "",
+ # "karabo-id": "SPB_IRDA_JF4M",
+ # "karabo-da": [
+ # "JNGFR01", "JNGFR02", "JNGFR03", "JNGFR04",
+ # "JNGFR05", "JNGFR06", "JNGFR07", "JNGFR08"
+ # ],
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "SPB_IRDA_JF4M-DARK-ADAPTIVE":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/SPB/202130/p900204/raw",
+ # "run-high": "88",
+ # "run-med": "89",
+ # "run-low": "90",
+ # "karabo-id-control": "",
+ # "karabo-id": "SPB_IRDA_JF4M",
+ # "karabo-da": [
+ # "JNGFR01", "JNGFR02", "JNGFR03", "JNGFR04",
+ # "JNGFR05", "JNGFR06", "JNGFR07", "JNGFR08"
+ # ],
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "HED_IA1_JF500K1-CORRECT-ADAPTIVE":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw",
+ # "run": "230",
+ # "karabo-id": "HED_IA1_JF500K1",
+ # "karabo-da": "JNGFR01",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "HED_IA1_JF500K1-DARK-ADAPTIVE":
+ # {
+ # "det_type": "JUNGFRAU",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw",
+ # "run-high": "219",
+ # "run-med": "220",
+ # "run-low": "221",
+ # "karabo-id": "HED_IA1_JF500K1",
+ # "karabo-da": "JNGFR01",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
+ # "HED_IA1_EPX100-1-CORRECT":
+ # {
+ # "det_type": "EPIX100",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw",
+ # "run": "230",
+ # "karabo-id": "HED_IA1_EPX100-1",
+ # "karabo-da": "EPIX01",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
"HED_IA1_EPX100-1-DARK":
{
"det_type": "EPIX100",
@@ -356,39 +356,39 @@ automated_test_config = {
"config":
{
"out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw",
- "run": "219",
+ "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
+ "run": "9047",
"karabo-id": "HED_IA1_EPX100-1",
"karabo-da": "EPIX01",
},
"reference-folder": "{}/{}/{}",
},
- "SQS_NQS_PNCCD1MP-CORRECT":
- {
- "det_type": "PNCCD",
- "cal_type": "CORRECT",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/SQS/202031/p900166/raw",
- "run": "347",
- "karabo-id": "SQS_NQS_PNCCD1MP",
- "karabo-da": "PNCCD01",
- },
- "reference-folder": "{}/{}/{}"
- },
- "SQS_NQS_PNCCD1MP-DARK":
- {
- "det_type": "PNCCD",
- "cal_type": "DARK",
- "config":
- {
- "out-folder": "{}/{}/{}",
- "in-folder": "/gpfs/exfel/exp/SQS/202031/p900166/raw",
- "run": "345",
- "karabo-id": "SQS_NQS_PNCCD1MP",
- "karabo-da": "PNCCD01",
- },
- "reference-folder": "{}/{}/{}",
- },
+ # "SQS_NQS_PNCCD1MP-CORRECT":
+ # {
+ # "det_type": "PNCCD",
+ # "cal_type": "CORRECT",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/SQS/202031/p900166/raw",
+ # "run": "347",
+ # "karabo-id": "SQS_NQS_PNCCD1MP",
+ # "karabo-da": "PNCCD01",
+ # },
+ # "reference-folder": "{}/{}/{}"
+ # },
+ # "SQS_NQS_PNCCD1MP-DARK":
+ # {
+ # "det_type": "PNCCD",
+ # "cal_type": "DARK",
+ # "config":
+ # {
+ # "out-folder": "{}/{}/{}",
+ # "in-folder": "/gpfs/exfel/exp/SQS/202031/p900166/raw",
+ # "run": "345",
+ # "karabo-id": "SQS_NQS_PNCCD1MP",
+ # "karabo-da": "PNCCD01",
+ # },
+ # "reference-folder": "{}/{}/{}",
+ # },
}
\ No newline at end of file
diff --git a/tests/test_reference_runs/conftest.py b/tests/test_reference_runs/conftest.py
index 21d55eabc8868642d85a63d7129ef4bf73afbeef..c30ebfcd69384148b7ee5664518987a59f2ad845 100644
--- a/tests/test_reference_runs/conftest.py
+++ b/tests/test_reference_runs/conftest.py
@@ -56,7 +56,12 @@ def release_test_config(request):
skip_numerical_validation = request.config.getoption(
"--no-numerical-validation")
picked_test = request.config.getoption("--picked-test")
- return detectors, calibration, picked_test, skip_numerical_validation
+ reference_folder = request.config.getoption("--reference-folder")
+ out_folder = request.config.getoption("--out-folder")
+ return (
+ detectors, calibration, picked_test,
+ skip_numerical_validation, reference_folder, out_folder
+ )
def pytest_configure(config):