From f425ebc34939eaef89bb3988799e2e2fd7d54efd Mon Sep 17 00:00:00 2001
From: Robert Applin <40830825+robertapplin@users.noreply.github.com>
Date: Fri, 14 Sep 2018 10:21:52 +0100
Subject: [PATCH] Update and rearrange parameter files Refs #23506
---
instrument/IRIS_Parameters.xml | 29 +++++++++++++++++++++++------
instrument/OSIRIS_Parameters.xml | 29 +++++++++++++++++++++++------
2 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/instrument/IRIS_Parameters.xml b/instrument/IRIS_Parameters.xml
index cb5ae044100..613f02c6e74 100644
--- a/instrument/IRIS_Parameters.xml
+++ b/instrument/IRIS_Parameters.xml
@@ -81,12 +81,8 @@
<parameter name="Workflow.NamingConvention" type="string">
<value val="AnalyserReflection" />
</parameter>
-<parameter name="Workflow.SE-log" type="string">
- <value val="sample" />
-</parameter>
-<parameter name="Workflow.SE-log-value" type="string">
- <value val="last_value" />
-</parameter>
+
+<!-- Beam dimensions -->
<parameter name="Workflow.beam-width" type="string">
<value val="2.1" />
</parameter>
@@ -94,6 +90,27 @@
<value val="3.2" />
</parameter>
+<!-- Absorption corrections -->
+<parameter name="Workflow.absorption-wavelengths" type="string">
+ <value val="10" />
+</parameter>
+<parameter name="Workflow.absorption-events" type="string">
+ <value val="5000" />
+</parameter>
+<parameter name="Workflow.absorption-interpolation" type="string">
+ <value val="CSpline" />
+</parameter>
+<parameter name="Workflow.absorption-attempts" type="string">
+ <value val="5000" />
+</parameter>
+
+<!-- Sample environment -->
+<parameter name="Workflow.SE-log" type="string">
+ <value val="sample" />
+</parameter>
+<parameter name="Workflow.SE-log-value" type="string">
+ <value val="last_value" />
+</parameter>
<parameter name="Workflow.TemperatureSensorNames" type="string">
<value val="Bottom_can,Middle_can,Top_can" />
</parameter>
diff --git a/instrument/OSIRIS_Parameters.xml b/instrument/OSIRIS_Parameters.xml
index ec2b1e4fa05..6a36076130d 100644
--- a/instrument/OSIRIS_Parameters.xml
+++ b/instrument/OSIRIS_Parameters.xml
@@ -73,12 +73,8 @@
<parameter name="Workflow.NamingConvention" type="string">
<value val="AnalyserReflection" />
</parameter>
-<parameter name="Workflow.SE-log" type="string">
- <value val="sample" />
-</parameter>
-<parameter name="Workflow.SE-log-value" type="string">
- <value val="last_value" />
-</parameter>
+
+<!-- Beam dimensions -->
<parameter name="Workflow.beam-width" type="string">
<value val="2.2" />
</parameter>
@@ -86,6 +82,27 @@
<value val="4.4" />
</parameter>
+<!-- Absorption corrections -->
+<parameter name="Workflow.absorption-wavelengths" type="string">
+ <value val="10" />
+</parameter>
+<parameter name="Workflow.absorption-events" type="string">
+ <value val="5000" />
+</parameter>
+<parameter name="Workflow.absorption-interpolation" type="string">
+ <value val="CSpline" />
+</parameter>
+<parameter name="Workflow.absorption-attempts" type="string">
+ <value val="5000" />
+</parameter>
+
+<!-- Sample environment -->
+<parameter name="Workflow.SE-log" type="string">
+ <value val="sample" />
+</parameter>
+<parameter name="Workflow.SE-log-value" type="string">
+ <value val="last_value" />
+</parameter>
<parameter name="Workflow.TemperatureSensorNames" type="string">
<value val="Bottom_can,Middle_can,Top_can" />
</parameter>
--
GitLab