diff --git a/rundetection/rules/iris_rules.py b/rundetection/rules/iris_rules.py index d275110..8d1881e 100644 --- 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 index d5a5bfc..fc5a524 100644 --- 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 index 1f161f7..66f3ce6 100644 --- 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 } \ No newline at end of file diff --git a/rundetection/specifications/osiris_specification.json b/rundetection/specifications/osiris_specification.json index 28f591f..0af90cc 100644 --- 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,