diff --git a/Code/Mantid/instrument/BASIS_Parameters.xml b/Code/Mantid/instrument/BASIS_Parameters.xml index f9df8553197513f43a6f76343e8211d091f559e9..e1538e03f2d80e8ec1a47daee92f380594fff84e 100644 --- a/Code/Mantid/instrument/BASIS_Parameters.xml +++ b/Code/Mantid/instrument/BASIS_Parameters.xml @@ -43,13 +43,19 @@ <parameter name="Workflow.MaskFile" type="string"> <value val="BASIS_Mask.xml" /> </parameter> -<parameter name="Workflow.MonitorArea" > +<parameter name="Workflow.Monitor1-SpectrumNumber" > + <value val="0" /> +</parameter> +<parameter name="Workflow.Monitor1-SpectrumNumber" > + <value val="0" /> +</parameter> +<parameter name="Workflow.Monitor1-Area" > <value val="1.276e-3" /> </parameter> -<parameter name="Workflow.MonitorThickness" > +<parameter name="Workflow.Monitor1-Thickness" > <value val="0.025" /> </parameter> -<parameter name="Workflow.MonitorScalingFactor"> +<parameter name="Workflow.Monitor1-ScalingFactor"> <value val="1e6" /> </parameter> <parameter name="Workflow.UnwrapMonitor" type="string"> diff --git a/Code/Mantid/instrument/IRIS_Parameters.xml b/Code/Mantid/instrument/IRIS_Parameters.xml index 0e169731aa9e2bd9a966407bc76a66117bcc1358..e3b6836f45ba4582d2b5c9496b9a0c7a26590109 100644 --- a/Code/Mantid/instrument/IRIS_Parameters.xml +++ b/Code/Mantid/instrument/IRIS_Parameters.xml @@ -36,7 +36,7 @@ </parameter> <!-- Reduction workflow parameters under this line --> -<parameter name="Workflow.Monitor1-ID" > +<parameter name="Workflow.Monitor1-SpectrumNumber" > <value val="0" /> </parameter> <parameter name="Workflow.Monitor1-Area" > @@ -51,7 +51,7 @@ <parameter name="Workflow.Monitor1-ScalingFactor"> <value val="1e6" /> </parameter> -<parameter name="Workflow.Monitor2-ID" > +<parameter name="Workflow.Monitor2-SpectrumNumber" > <value val="1" /> </parameter> <parameter name="Workflow.Monitor2-Area" > diff --git a/Code/Mantid/instrument/OSIRIS_Parameters.xml b/Code/Mantid/instrument/OSIRIS_Parameters.xml index 79688658cd7801639df2aff04be1a7e756c9a7f3..0e2cee75b639960e94265d6386ad6c4213d2ab8f 100644 --- a/Code/Mantid/instrument/OSIRIS_Parameters.xml +++ b/Code/Mantid/instrument/OSIRIS_Parameters.xml @@ -28,7 +28,7 @@ </parameter> <!-- Reduction workflow parameters under this line --> -<parameter name="Workflow.Monitor1-ID" > +<parameter name="Workflow.Monitor1-SpectrumNumber" > <value val="0" /> </parameter> <parameter name="Workflow.Monitor1-Area" > @@ -43,7 +43,7 @@ <parameter name="Workflow.Monitor1-ScalingFactor"> <value val="1e6" /> </parameter> -<parameter name="Workflow.Monitor2-ID" > +<parameter name="Workflow.Monitor2-SpectrumNumber" > <value val="1" /> </parameter> <parameter name="Workflow.Monitor2-Area" > diff --git a/Code/Mantid/instrument/TOSCA_Parameters.xml b/Code/Mantid/instrument/TOSCA_Parameters.xml index 0b18d665dc9a33c995eca4467e12cae4ebb5a78b..4642c7e1bea0a2c980e1f9d6d21ac63bd73538cd 100644 --- a/Code/Mantid/instrument/TOSCA_Parameters.xml +++ b/Code/Mantid/instrument/TOSCA_Parameters.xml @@ -39,8 +39,8 @@ <parameter name="Workflow.InfoTable" type="string"> <value val="inst_abrv, run_number, user_name, run_title, hd_dur" /> </parameter> -<parameter name="Workflow.Monitor1-ID" > - <value val="0" /> +<parameter name="Workflow.Monitor1-SpectrumNumber" > + <value val="140" /> </parameter> <parameter name="Workflow.Monitor1-Area" > <value val="5.391011e-5" /> diff --git a/Code/Mantid/instrument/VESUVIO_diffraction_diffspec_Parameters.xml b/Code/Mantid/instrument/VESUVIO_diffraction_diffspec_Parameters.xml index 4ebe07d77ca567d14ca0f0e3bc7abb82650206d7..d84a653b711508929b6277add3e9ec6304a90820 100644 --- a/Code/Mantid/instrument/VESUVIO_diffraction_diffspec_Parameters.xml +++ b/Code/Mantid/instrument/VESUVIO_diffraction_diffspec_Parameters.xml @@ -31,13 +31,17 @@ <value val="1" /> </parameter> +<parameter name="Workflow.Monitor1-SpectrumNumber"> + <value val="0" /> +</parameter> + <!-- These two properties being set to invalid values (-1) will signal to the reducer that it is not to correct for monitor efficiency. --> -<parameter name="Workflow.MonitorArea"> +<parameter name="Workflow.Monitor1-Area"> <value val="-1" /> </parameter> -<parameter name="Workflow.MonitorThickness"> +<parameter name="Workflow.Monitor1-Thickness"> <value val="-1" /> </parameter> diff --git a/Code/Mantid/instrument/VISION_Parameters.xml b/Code/Mantid/instrument/VISION_Parameters.xml index de1b0103df46276929a00dfb5223f47971e50716..891f981338d6d73b19d9047beb1c51f3c6e968be 100644 --- a/Code/Mantid/instrument/VISION_Parameters.xml +++ b/Code/Mantid/instrument/VISION_Parameters.xml @@ -36,13 +36,16 @@ <!-- This is the step size to optionally rebin the monitor to"--> <value val="10.0" /> </parameter> -<parameter name="Workflow.MonitorArea" > +<parameter name="Workflow.Monitor1-SpectrumNumber" > + <value val="0" /> +</parameter> +<parameter name="Workflow.Monitor1-Area" > <value val="5.391011e-5" /> </parameter> -<parameter name="Workflow.MonitorThickness" > +<parameter name="Workflow.Monitor1-Thickness" > <value val="0.013" /> </parameter> -<parameter name="Workflow.MonitorScalingFactor"> +<parameter name="Workflow.Monitor1-ScalingFactor"> <value val="1e9" /> </parameter> <parameter name="Workflow.UnwrapMonitor" type="string"> diff --git a/Code/Mantid/instrument/VISION_diffraction__Parameters.xml b/Code/Mantid/instrument/VISION_diffraction__Parameters.xml index 02d268afc163ba2e574248a4aca9b7b541d8f162..e144de3b098e269911ffa7edf17b162fc3e30444 100644 --- a/Code/Mantid/instrument/VISION_diffraction__Parameters.xml +++ b/Code/Mantid/instrument/VISION_diffraction__Parameters.xml @@ -37,10 +37,10 @@ <!-- These two properties being set to invalid values (-1) will signal to the reducer that it is not to correct for monitor efficiency. --> -<parameter name="Workflow.MonitorArea"> +<parameter name="Workflow.Monitor1-Area"> <value val="-1" /> </parameter> -<parameter name="Workflow.MonitorThickness"> +<parameter name="Workflow.Monitor1-Thickness"> <value val="-1" /> </parameter>