diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff06e3ac2bab1aeae44e78fd49c29e50e7eb9966..ac6e620676f41dae010db5d79ea71075d63eaba1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,7 +67,6 @@ automated_test: - export LANG=C # Hopefully detect anything relying on locale - python3 -m pip install ".[automated_test]" - echo "Running automated test. This can take sometime to finish depending on the test data." - - echo " Source branch = $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME, Target branch = CI_MERGE_REQUEST_TARGET_BRANCH_NAME" - echo "Given variables are REFERENCE=$REFERENCE, OUTPUT=$OUTPUT, DETECTOR=$DETECTOR, CALIBRATION=$CALIBRATION" - python3 -m pytest ./tests/test_reference_runs --color yes --verbose --release-test --reference-folder /gpfs/exfel/data/scratch/xcaltst/test/$REFERENCE --out-folder /gpfs/exfel/data/scratch/xcaltst/test/$OUTPUT --detectors $DETECTOR --calibration $CALIBRATION diff --git a/tests/test_reference_runs/callab_tests.py b/tests/test_reference_runs/callab_tests.py index 0aeb856d404e4c5e41ded3341f0e4cf91ed95ce3..b5bfc78ab58c8493f602d713a6e8d70a7bdf1b54 100644 --- a/tests/test_reference_runs/callab_tests.py +++ b/tests/test_reference_runs/callab_tests.py @@ -5,8 +5,9 @@ automated_test_config = { "config": { "blc-stripes": True, "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw", - "run": "95", + # "/gpfs/exfel/exp/SPB/202131/p900215/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9014", # Original run: "95" "karabo-id-control": "SPB_IRU_AGIPD1M1", "karabo-id": "SPB_DET_AGIPD1M-1", "slurm-mem": "750", @@ -21,13 +22,13 @@ automated_test_config = { "cal_type": "DARK", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw", - "run-high": "91", - "run-med": "92", - "run-low": "93", + # "/gpfs/exfel/exp/SPB/202131/p900215/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9011", # Original run: "91" + "run-med": "9012", # Original run: "92" + "run-low": "9013", # Original run "93" "karabo-id-control": "SPB_IRU_AGIPD1M1", "karabo-id": "SPB_DET_AGIPD1M-1", - "slurm-mem": "750", "ctrl-source-template": "{}/MDL/FPGA_COMP", }, "reference-folder": "{}/{}/{}", @@ -39,11 +40,12 @@ automated_test_config = { "blc-stripes": True, "rel-gain": True, "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw", + # "/gpfs/exfel/exp/SPB/202131/p900215/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", "run": "262", "karabo-id-control": "SPB_IRU_AGIPD1M1", "karabo-id": "SPB_DET_AGIPD1M-1", - "slurm-mem": "750", + "slurm-mem": "9018", # Original run: "750", "sequences": "0", "ctrl-source-template": "{}/MDL/FPGA_COMP", }, @@ -54,13 +56,13 @@ automated_test_config = { "cal_type": "DARK", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/SPB/202131/p900215/raw", - "run-high": "216", - "run-med": "217", - "run-low": "218", + # "/gpfs/exfel/exp/SPB/202131/p900215/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9015", # Original run: "216", + "run-med": "9016", # Original run: "217", + "run-low": "9017", # Original run: "218", "karabo-id-control": "SPB_IRU_AGIPD1M1", "karabo-id": "SPB_DET_AGIPD1M-1", - "slurm-mem": "750", "ctrl-source-template": "{}/MDL/FPGA_COMP", }, "reference-folder": "{}/{}/{}", @@ -72,8 +74,9 @@ automated_test_config = { "blc-stripes": True, "rel-gain": True, "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw", - "run": "21", + # "/gpfs/exfel/exp/MID/202121/p002929/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9022", # Original run: "21", "karabo-id-control": "MID_EXP_AGIPD1M1", "karabo-id": "MID_DET_AGIPD1M-1", "slurm-mem": "750", @@ -89,8 +92,9 @@ automated_test_config = { "blc-stripes": True, "rel-gain": True, "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw", - "run": "21", + # "/gpfs/exfel/exp/MID/202121/p002929/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9022", # Original run: "21", "max-pulses": [0, 160, 2], "common-mode": True, "karabo-id-control": "MID_EXP_AGIPD1M1", @@ -109,8 +113,9 @@ automated_test_config = { "blc-stripes": True, "rel-gain": True, "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw", - "run": "21", + # "/gpfs/exfel/exp/MID/202121/p002929/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9022", # Original run: "21", "max-pulses": [0, 160, 2], "no-common-mode": True, "karabo-id-control": "MID_EXP_AGIPD1M1", @@ -126,13 +131,13 @@ automated_test_config = { "cal_type": "DARK", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/MID/202121/p002929/raw", - "run-high": "4", - "run-med": "5", - "run-low": "6", + # "/gpfs/exfel/exp/MID/202121/p002929/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9019", # Original run: "4" + "run-med": "9020", # Original run: "5" + "run-low": "9021", # Original run: "6" "karabo-id-control": "MID_EXP_AGIPD1M1", "karabo-id": "MID_DET_AGIPD1M-1", - "slurm-mem": "750", "ctrl-source-template": "{}/MDL/FPGA_COMP", }, "reference-folder": "{}/{}/{}", @@ -144,8 +149,9 @@ automated_test_config = { "blc-stripes": True, "rel-gain": True, "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/HED/202131/p900228/raw", - "run": "29", + # "/gpfs/exfel/exp/HED/202131/p900228/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9026", # Original run: "29", "karabo-id-control": "HED_EXP_AGIPD500K2G", "karabo-id": "HED_DET_AGIPD500K2G", "slurm-mem": "750", @@ -159,90 +165,79 @@ automated_test_config = { "cal_type": "DARK", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/HED/202131/p900228/raw", - "run-high": "25", - "run-med": "26", - "run-low": "27", + # "/gpfs/exfel/exp/HED/202131/p900228/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9023", # Original run: "25", + "run-med": "9024", # Original run: "26", + "run-low": "9025", # Original run: "27", "karabo-id-control": "HED_EXP_AGIPD500K2G", "karabo-id": "HED_DET_AGIPD500K2G", - "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", -# "sequences": "0,1,2,50", -# "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", -# "sequences": "0,1,7", -# "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_JF500K-DARK-SINGLE": { + "det_type": "JUNGFRAU", + "cal_type": "DARK", + "config": { + "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/FXE/202101/p002478/raw/" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9031", # Original run: "47" + "run-med": "9032", # Original run: "48" + "run-low": "9033", # Original run: "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": "{}/{}/{}", + # "/gpfs/exfel/exp/FXE/202101/p002478/raw/" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9030", # Original from: 52 + "sequences": "0,50", + "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": "{}/{}/{}", + # "/gpfs/exfel/exp/FXE/202131/p900226/raw/" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9035", # Original run: "108" + "run-med": "9036", # Original run: "109" + "run-low": "9037", # Original run: "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/CALLAB/202130/p900203/raw", + # "/gpfs/exfel/exp/FXE/202131/p900226/raw" + "run": "9034", # Run cloned from run 106. + "sequences": "0,1", + "karabo-id-control": "", + "karabo-id": "FXE_XAD_JF1M", + "karabo-da": ["JNGFR01", "JNGFR02"], + }, + "reference-folder": "{}/{}/{}", + }, # "FXE_XAD_JF1M-DARK-BURST_LONGRUN": { # "det_type": "JUNGFRAU", # "cal_type": "DARK", @@ -258,66 +253,59 @@ automated_test_config = { # }, # "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", -# "sequences": "1,30,49", -# "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": "{}/{}/{}", -# }, + "FXE_XAD_JF1M-CORRECT-SINGLE": { + "det_type": "JUNGFRAU", + "cal_type": "CORRECT", + "config": { + "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/FXE/202101/p002478/raw/" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9030", # Original from: 52 + "sequences": "1,30,49", + "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": "{}/{}/{}", + # "/gpfs/exfel/exp/FXE/202101/p002478/raw/" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9031", # Original run: "47" + "run-med": "9032", # Original run: "48" + "run-low": "9033", # Original run: "49" + "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/CALLAB/202130/p900203/raw", + "run": "9007", + "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", @@ -342,107 +330,72 @@ automated_test_config = { }, "reference-folder": "{}/{}/{}", }, -# "SPB_IRDA_JF4M-DARK-FIXED": -# { -# "det_type": "JUNGFRAU", -# "cal_type": "DARK", -# "config": -# { -# "out-folder": "{}/{}/{}", -# "in-folder": "/gpfs/exfel/exp/SPB/202202/p003051/raw", -# "run-high": "166", -# "run-med": "168", -# "run-low": "169", -# "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", -# "sequences": "0,2,4", -# "karabo-id": "HED_IA1_JF500K1", -# "karabo-da": "JNGFR01", -# }, -# "reference-folder": "{}/{}/{}", -# }, -# "HED_IA1_JF500K2-CORRECT-ADAPTIVE": { -# "det_type": "JUNGFRAU", -# "cal_type": "CORRECT", -# "config": { -# "out-folder": "{}/{}/{}", -# "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw", -# "run": "230", -# "sequences": "0,1,4", -# "karabo-id": "HED_IA1_JF500K2", -# "karabo-da": "JNGFR02", -# }, -# "reference-folder": "{}/{}/{}", -# }, -# "HED_IA1_JF500K3-CORRECT-ADAPTIVE": { -# "det_type": "JUNGFRAU", -# "cal_type": "CORRECT", -# "config": { -# "out-folder": "{}/{}/{}", -# "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw", -# "run": "230", -# "sequences": "1,2,3", -# "karabo-id": "HED_IA1_JF500K3", -# "karabo-da": "JNGFR03", -# }, -# "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_JF500K2-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_JF500K2", -# "karabo-da": "JNGFR02", -# }, -# "reference-folder": "{}/{}/{}", -# }, -# "HED_IA1_JF500K3-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_JF500K3", -# "karabo-da": "JNGFR03", -# }, -# "reference-folder": "{}/{}/{}", -# }, + # MISSING FROM REFERENCE RUNS. + # "SPB_IRDA_JF4M-DARK-FIXED": + # { + # "det_type": "JUNGFRAU", + # "cal_type": "DARK", + # "config": + # { + # "out-folder": "{}/{}/{}", + # "in-folder": "/gpfs/exfel/exp/SPB/202202/p003051/raw", + # "run-high": "166", + # "run-med": "168", + # "run-low": "169", + # "karabo-id-control": "", + # "karabo-id": "SPB_IRDA_JF4M", + # "karabo-da": [ + # "JNGFR01", "JNGFR02", "JNGFR03", "JNGFR04", + # "JNGFR05", "JNGFR06", "JNGFR07", "JNGFR08" + # ], + # }, + # "reference-folder": "{}/{}/{}", + # }, + "HED_IA1_JF500K1-DARK-ADAPTIVE": { + "det_type": "JUNGFRAU", + "cal_type": "DARK", + "config": { + "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/HED/202102/p002656/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9039", # Original run: "219", + "run-med": "9040", # Original run: "220", + "run-low": "9041", # Original run: "221", + "karabo-id": "HED_IA1_JF500K1", + "karabo-da": "JNGFR01", + }, + "reference-folder": "{}/{}/{}", + }, + "HED_IA1_JF500K2-DARK-ADAPTIVE": { + "det_type": "JUNGFRAU", + "cal_type": "DARK", + "config": { + "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/HED/202102/p002656/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9039", # Original run: "219", + "run-med": "9040", # Original run: "220", + "run-low": "9041", # Original run: "221", + "karabo-id": "HED_IA1_JF500K2", + "karabo-da": "JNGFR02", + }, + "reference-folder": "{}/{}/{}", + }, + "HED_IA1_JF500K3-DARK-ADAPTIVE": { + "det_type": "JUNGFRAU", + "cal_type": "DARK", + "config": { + "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/HED/202102/p002656/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9039", # Original run: "219", + "run-med": "9040", # Original run: "220", + "run-low": "9041", # Original run: "221", + "karabo-id": "HED_IA1_JF500K3", + "karabo-da": "JNGFR03", + }, + "reference-folder": "{}/{}/{}", + }, # "HED_IA1_JF500K1-DARK-FIXED": # { # "det_type": "JUNGFRAU", @@ -464,47 +417,64 @@ automated_test_config = { "cal_type": "CORRECT", "config": { "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/HED/202102/p002656/raw" "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", - "run": "9038", + "run": "9038", # Original run: "230" "sequences": "0,2,4", "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", - # "sequences": "1,2,3", - # "fix-temperature": 290, - # }, - # "reference-folder": "{}/{}/{}", - # }, - # "HED_IA1_EPX100-1-DARK": { - # "det_type": "EPIX100", - # "cal_type": "DARK", - # "config": { - # "out-folder": "{}/{}/{}", - # "in-folder": "/gpfs/exfel/exp/HED/202102/p002656/raw", - # "run": "219", - # "karabo-id": "HED_IA1_EPX100-1", - # "karabo-da": "EPIX01", - # }, - # "reference-folder": "{}/{}/{}", - # }, + "HED_IA1_JF500K2-CORRECT-ADAPTIVE": { + "det_type": "JUNGFRAU", + "cal_type": "CORRECT", + "config": { + "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/HED/202102/p002656/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9038", # Original run: "230" + "sequences": "0", + "karabo-id": "HED_IA1_JF500K2", + "karabo-da": "JNGFR02", + }, + "reference-folder": "{}/{}/{}", + }, + "HED_IA1_JF500K3-CORRECT-ADAPTIVE": { + "det_type": "JUNGFRAU", + "cal_type": "CORRECT", + "config": { + "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/HED/202102/p002656/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9038", # Original run: "230" + "sequences": "1,3", + "karabo-id": "HED_IA1_JF500K3", + "karabo-da": "JNGFR03", + }, + "reference-folder": "{}/{}/{}", + }, + "HED_IA1_EPX100-1-DARK": { + "det_type": "EPIX100", + "cal_type": "DARK", + "config": { + "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/HED/202102/p002656/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "2047", # Original run: "219", + "karabo-id": "HED_IA1_EPX100-1", + "karabo-da": "EPIX01", + }, + "reference-folder": "{}/{}/{}", + }, "MID_EXP_EPIX-2-CORRECT": { "det_type": "EPIX100", "cal_type": "CORRECT", "config": { "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/HED/202102/p002656/raw" "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", - "run": "9038", + "run": "9038", # Original run: "230" "karabo-id": "MID_EXP_EPIX-2", "karabo-da": "EPIX01", "sequences": "1,2,3", @@ -517,8 +487,9 @@ automated_test_config = { "cal_type": "CORRECT", "config": { "out-folder": "{}/{}/{}", + # "/gpfs/exfel/exp/HED/202102/p002656/raw" "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", - "run": "9038", + "run": "9038", # Original run: "230" "karabo-id": "HED_IA1_EPX100-1", "karabo-da": "EPIX01", "sequences": "1,2,3", @@ -532,7 +503,7 @@ automated_test_config = { "config": { "out-folder": "{}/{}/{}", "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", - "run": "9045", + "run": "9045", # Original run: 224 proposal 2655 "karabo-id": "MID_EXP_EPIX-2", "karabo-da": "EPIX02", }, @@ -543,8 +514,9 @@ automated_test_config = { "cal_type": "CORRECT", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/SQS/202031/p900166/raw", - "run": "347", + # "/gpfs/exfel/exp/SQS/202031/p900166/raw", + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9001", # Original run: "347", "karabo-id": "SQS_NQS_PNCCD1MP", "karabo-da": "PNCCD01", }, @@ -555,8 +527,9 @@ automated_test_config = { "cal_type": "DARK", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/SQS/202031/p900166/raw", - "run": "345", + # "/gpfs/exfel/exp/SQS/202031/p900166/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9000", # Original run: "345", "karabo-id": "SQS_NQS_PNCCD1MP", "karabo-da": "PNCCD01", }, @@ -567,21 +540,23 @@ automated_test_config = { "cal_type": "DARK", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/FXE/202131/p900226/raw", - "run-high": "145", - "run-med": "146", - "run-low": "147", + # "/gpfs/exfel/exp/FXE/202131/p900226/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run-high": "9008", # Original run: "145", + "run-med": "9009", # Original run: "146", + "run-low": "9010", # Original run: "147", "karabo-id": "FXE_DET_LPD1M-1", }, "reference-folder": "{}/{}/{}", }, - "FXE_DET_LPD1M-1-CORRECT": { + "FXE_DET_LPD1M-1-CORRECT": { # THIS IS A DARK RUN. "det_type": "LPD", "cal_type": "CORRECT", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/FXE/202131/p900226/raw", - "run": "145", + # "/gpfs/exfel/exp/FXE/202131/p900226/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9008", # Original run: "145", "sequences": "0", "karabo-id": "FXE_DET_LPD1M-1", "slurm-mem": "750", @@ -593,8 +568,9 @@ automated_test_config = { "cal_type": "DARK", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/SCS/202122/p002937/raw", - "run": "1723", + # "/gpfs/exfel/exp/SCS/202122/p002937/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9028", # Original run: "1723", "karabo-id": "SCS_DET_DSSC1M-1", "slow-data-path": "SCS_CDIDET_DSSC/FPGA/PPT_Q", "slow-data-aggregators": @@ -610,51 +586,52 @@ automated_test_config = { "cal_type": "CORRECT", "config": { "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/SCS/202122/p002937/raw", - "run": "1723", + # "/gpfs/exfel/exp/SCS/202122/p002937/raw" + "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw", + "run": "9028", # Original run: "1723", "karabo-id": "SCS_DET_DSSC1M-1", "slow-data-path": "SCS_CDIDET_DSSC/FPGA/PPT_Q", }, "reference-folder": "{}/{}/{}", }, - "FXE_XAD_G2XES-DARK": { - "det_type": "Gotthard2", - "cal_type": "DARK", - "config": { - "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/FXE/202231/p900298/raw", - "karabo-da": "GH201", - "run-high": "7", - "run-med": "8", - "run-low": "9", - "karabo-id": "FXE_XAD_G2XES", - }, - "reference-folder": "{}/{}/{}", - }, - "FXE_XAD_G2XES-CORRECT": { - "det_type": "Gotthard2", - "cal_type": "CORRECT", - "config": { - "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/FXE/202231/p900298/raw", - "karabo-da": "GH201", - "run": "7", - "karabo-id": "FXE_XAD_G2XES", - "no-offset-correction": True, - }, - "reference-folder": "{}/{}/{}", - }, - "SPB_50UM_GH2-CORRECT": { - "det_type": "Gotthard2", - "cal_type": "CORRECT", - "config": { - "out-folder": "{}/{}/{}", - "in-folder": "/gpfs/exfel/exp/SPB/202321/p004577/raw", - "karabo-da": "GH200", - "run": "98", - "sequences": "0,3,6", - "karabo-id": "SPB_50UM_GH2", - }, - "reference-folder": "{}/{}/{}", - }, + # "FXE_XAD_G2XES-DARK": { + # "det_type": "Gotthard2", + # "cal_type": "DARK", + # "config": { + # "out-folder": "{}/{}/{}", + # "in-folder": "/gpfs/exfel/exp/FXE/202231/p900298/raw", + # "karabo-da": "GH201", + # "run-high": "7", + # "run-med": "8", + # "run-low": "9", + # "karabo-id": "FXE_XAD_G2XES", + # }, + # "reference-folder": "{}/{}/{}", + # }, + # "FXE_XAD_G2XES-CORRECT": { + # "det_type": "Gotthard2", + # "cal_type": "CORRECT", + # "config": { + # "out-folder": "{}/{}/{}", + # "in-folder": "/gpfs/exfel/exp/FXE/202231/p900298/raw", + # "karabo-da": "GH201", + # "run": "7", + # "karabo-id": "FXE_XAD_G2XES", + # "no-offset-correction": True, + # }, + # "reference-folder": "{}/{}/{}", + # }, + # "SPB_50UM_GH2-CORRECT": { + # "det_type": "Gotthard2", + # "cal_type": "CORRECT", + # "config": { + # "out-folder": "{}/{}/{}", + # "in-folder": "/gpfs/exfel/exp/SPB/202321/p004577/raw", + # "karabo-da": "GH200", + # "run": "98", + # "sequences": "0,3,6", + # "karabo-id": "SPB_50UM_GH2", + # }, + # "reference-folder": "{}/{}/{}", + # }, }