Add calibration support for multiple files IRIS and OSIRIS

fiaisis · Nov 21, 2024 · a81e99b · a81e99b
1 parent b9daab2
commit a81e99b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/rundetection/rules/iris_rules.py b/rundetection/rules/iris_rules.py
@@ -80,4 +80,4 @@ def verify(self, job_request: JobRequest) -> None:
         if not self._value:
             return
         reflection = job_request.additional_values["reflection"]
-        job_request.additional_values["calibration_run_number"] = self._value[reflection]
+        job_request.additional_values["calibration_run_numbers"] = self._value[reflection]
diff --git a/rundetection/rules/osiris_rules.py b/rundetection/rules/osiris_rules.py
@@ -124,7 +124,7 @@ def verify(self, job_request: JobRequest) -> None:
             job_request.additional_values["analyser"] = "graphite"
 
 
-class OsirisReflectionCalibrationRule(Rule[dict[str, str]]):
+class OsirisReflectionCalibrationRule(Rule[dict[str, list[str]]]):
     """
     Determine the reflection and set calibration run number based on the reflection
     """
@@ -173,4 +173,4 @@ def verify(self, job_request: JobRequest) -> None:
         reflection = self._determine_reflection(job_request)
 
         job_request.additional_values["reflection"] = reflection
-        job_request.additional_values["calibration_run_number"] = self._value[reflection]
+        job_request.additional_values["calibration_run_numbers"] = self._value[reflection]
diff --git a/rundetection/specifications/iris_specification.json b/rundetection/specifications/iris_specification.json
@@ -1,6 +1,6 @@
 {
   "enabled": true,
   "irisreduction": true,
-  "iriscalibration": {"002": "00105275", "004": "00105275"},
+  "iriscalibration": {"002": "105313, 105315, 105317", "004": "105275"},
   "molspecstitch": true
 }
diff --git a/rundetection/specifications/osiris_specification.json b/rundetection/specifications/osiris_specification.json
@@ -1,6 +1,6 @@
 {
   "enabled": true,
-  "osiriscalibfilesandreflection": {"002": "00149059", "004": "00149060"},
+  "osiriscalibfilesandreflection": {"002": "149784, 149785, 149786", "004": "149789, 149790"},
   "osirisreductionmode": false,
   "osirisdefaultspectroscopy": true,
   "osirisdefaultgraniteanalyser": true,