From a7af774217dab2a74b77613b5b097c27d98e7561 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Mon, 2 Oct 2023 09:51:56 +0200
Subject: [PATCH] update AGIPD tests with xray-gain and update reference folder
path
---
.gitlab-ci.yml | 3 +-
tests/test_reference_runs/callab_tests.py | 47 +++++++++++++++++++++--
2 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01a2d7ac0..5189ae59f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,7 +55,6 @@ pytest:
automated_test:
variables:
OUTPUT: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
- REFERENCE: reference_folder
DETECTORS: all
CALIBRATION: all
stage: automated_test
@@ -68,7 +67,7 @@ automated_test:
- python3 -m pip install ".[automated_test]"
- echo "Running automated test. This can take sometime to finish depending on the test data."
- echo "Given variables are REFERENCE=$REFERENCE, OUTPUT=$OUTPUT, DETECTORS=$DETECTORS, 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 $DETECTORS --calibration $CALIBRATION --find-difference
+ - python3 -m pytest ./tests/test_reference_runs --color yes --verbose --release-test --reference-folder /gpfs/exfel/d/cal_tst/reference_folder --out-folder /gpfs/exfel/data/scratch/xcaltst/test/$OUTPUT --detectors $DETECTORS --calibration $CALIBRATION --find-difference
timeout: 24 hours
cython-editable-install-test:
diff --git a/tests/test_reference_runs/callab_tests.py b/tests/test_reference_runs/callab_tests.py
index 3923bf478..b566e8598 100644
--- a/tests/test_reference_runs/callab_tests.py
+++ b/tests/test_reference_runs/callab_tests.py
@@ -13,6 +13,7 @@ automated_test_config = {
"slurm-mem": "750",
"sequences": "0",
"rel-gain": True,
+ "xray-gain": True,
"n-cores-files": 2,
"ctrl-source-template": "{}/MDL/FPGA_COMP",
},
@@ -41,6 +42,7 @@ automated_test_config = {
"config": {
"blc-stripes": True,
"rel-gain": True,
+ "xray-gain": True,
"out-folder": "{}/{}/{}",
# "/gpfs/exfel/exp/SPB/202131/p900215/raw"
"in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
@@ -76,6 +78,7 @@ automated_test_config = {
"config": {
"blc-stripes": True,
"rel-gain": True,
+ "xray-gain": True,
"out-folder": "{}/{}/{}",
# "/gpfs/exfel/exp/MID/202121/p002929/raw"
"in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
@@ -95,6 +98,7 @@ automated_test_config = {
"config": {
"blc-stripes": True,
"rel-gain": True,
+ "xray-gain": True,
"out-folder": "{}/{}/{}",
# "/gpfs/exfel/exp/MID/202121/p002929/raw"
"in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
@@ -117,6 +121,7 @@ automated_test_config = {
"config": {
"blc-stripes": True,
"rel-gain": True,
+ "xray-gain": True,
"out-folder": "{}/{}/{}",
# "/gpfs/exfel/exp/MID/202121/p002929/raw"
"in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
@@ -154,6 +159,7 @@ automated_test_config = {
"config": {
"blc-stripes": True,
"rel-gain": True,
+ "xray-gain": True,
"out-folder": "{}/{}/{}",
# "/gpfs/exfel/exp/HED/202131/p900228/raw"
"in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
@@ -320,10 +326,11 @@ automated_test_config = {
"cal_type": "DARK",
"config": {
"out-folder": "{}/{}/{}",
+ # /gpfs/exfel/exp/SPB/202130/p900204/raw
"in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
- "run-high": "9004",
- "run-med": "9005",
- "run-low": "9006",
+ "run-high": "9004", # 88
+ "run-med": "9005", # 89
+ "run-low": "9006", # 90
"karabo-id-control": "",
"karabo-id": "SPB_IRDA_JF4M",
"karabo-da": [
@@ -512,8 +519,9 @@ automated_test_config = {
"cal_type": "DARK",
"config": {
"out-folder": "{}/{}/{}",
+ # Original proposal: 2655
"in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
- "run": "9045", # Original run: 224 proposal 2655
+ "run": "9045", # Original run: 224
"karabo-id": "MID_EXP_EPIX-2",
"karabo-da": "EPIX02",
},
@@ -602,6 +610,37 @@ automated_test_config = {
},
"reference-folder": "{}/{}/{}",
},
+ "SQS_DET_DSSC1M-1-DARK": {
+ "det_type": "DSSC",
+ "cal_type": "DARK",
+ "config": {
+ "out-folder": "{}/{}/{}",
+ # "/gpfs/exfel/exp/SQS/202131/p900210/raw"
+ "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
+ "run": "9029", # Original run: "437",
+ "karabo-id": "SQS_DET_DSSC1M-1",
+ "slow-data-path": "SQS_NQS_DSSC/FPGA/PPT_Q",
+ "slow-data-aggregators":
+ - 1
+ - 2
+ - 3
+ - 4
+ },
+ "reference-folder": "{}/{}/{}",
+ },
+ "SQS_DET_DSSC1M-1-CORRECT": {
+ "det_type": "DSSC",
+ "cal_type": "CORRECT",
+ "config": {
+ "out-folder": "{}/{}/{}",
+ # "/gpfs/exfel/exp/SQS/202131/p900210/raw"
+ "in-folder": "/gpfs/exfel/exp/CALLAB/202130/p900203/raw",
+ "run": "9029", # Original run: "437",
+ "karabo-id": "SQS_DET_DSSC1M-1",
+ "slow-data-path": "SQS_NQS_DSSC/FPGA/PPT_Q",
+ },
+ "reference-folder": "{}/{}/{}",
+ },
# "FXE_XAD_G2XES-DARK": {
# "det_type": "Gotthard2",
# "cal_type": "DARK",
--
GitLab