diff --git a/Code/Mantid/instrument/CRISP_Parameters.xml b/Code/Mantid/instrument/CRISP_Parameters.xml index 8b05b80de69896755efe9bc24b968966faaae67d..785baa525ded9c506a2a3605dc44ec81e9679138 100644 --- a/Code/Mantid/instrument/CRISP_Parameters.xml +++ b/Code/Mantid/instrument/CRISP_Parameters.xml @@ -36,10 +36,14 @@ <value val="1"/> </parameter> + <!-- In the old Reflectometry UI, LambdaMin's value has 1 added to it. + In the new Reflectometry UI, this adjustment is NOT made. --> <parameter name="LambdaMin"> <value val="0.6"/> </parameter> + <!-- In the old Reflectometry UI, LambdaMax's value has 2 subtracted from it. + In the new Reflectometry UI, this adjustment is NOT made. --> <parameter name="LambdaMax"> <value val="6.5"/> </parameter> diff --git a/Code/Mantid/instrument/INTER_Parameters.xml b/Code/Mantid/instrument/INTER_Parameters.xml index 96216d6a8c2ab6320e46a750911e61135e6d6311..43671c19f03c3307ac6d04afc7f0ac9d652f1226 100644 --- a/Code/Mantid/instrument/INTER_Parameters.xml +++ b/Code/Mantid/instrument/INTER_Parameters.xml @@ -33,10 +33,14 @@ <value val="2"/> </parameter> + <!-- In the old Reflectometry UI, LambdaMin's value has 1 added to it. + In the new Reflectometry UI, this adjustment is NOT made. --> <parameter name="LambdaMin"> <value val="1.0"/> </parameter> + <!-- In the old Reflectometry UI, LambdaMax's value has 2 subtracted from it. + In the new Reflectometry UI, this adjustment is NOT made. --> <parameter name="LambdaMax"> <value val="17.0"/> </parameter> diff --git a/Code/Mantid/instrument/POLREF_Parameters.xml b/Code/Mantid/instrument/POLREF_Parameters.xml index fa461e5f257bd510e7caeda35b462008235e8f76..537b14c666c84408a4a37dbcf9c67edad60ecc35 100644 --- a/Code/Mantid/instrument/POLREF_Parameters.xml +++ b/Code/Mantid/instrument/POLREF_Parameters.xml @@ -39,10 +39,14 @@ <value val="2"/> </parameter> + <!-- In the old Reflectometry UI, LambdaMin's value has 1 added to it. + In the new Reflectometry UI, this adjustment is NOT made. --> <parameter name="LambdaMin"> <value val="1.0"/> </parameter> + <!-- In the old Reflectometry UI, LambdaMax's value has 2 subtracted from it. + In the new Reflectometry UI, this adjustment is NOT made. --> <parameter name="LambdaMax"> <value val="15.0"/> </parameter> diff --git a/Code/Mantid/instrument/SURF_Parameters.xml b/Code/Mantid/instrument/SURF_Parameters.xml index 7b90a98646dc0b53c0f506f91810512e7c3b41be..6c443dcccd977ecb9d68e8f55e082863f5af51a1 100644 --- a/Code/Mantid/instrument/SURF_Parameters.xml +++ b/Code/Mantid/instrument/SURF_Parameters.xml @@ -33,10 +33,14 @@ <value val="1"/> </parameter> + <!-- In the old Reflectometry UI, LambdaMin's value has 1 added to it. + In the new Reflectometry UI, this adjustment is NOT made. --> <parameter name="LambdaMin"> <value val="0.5"/> </parameter> + <!-- In the old Reflectometry UI, LambdaMax's value has 2 subtracted from it. + In the new Reflectometry UI, this adjustment is NOT made. --> <parameter name="LambdaMax"> <value val="7.0"/> </parameter> diff --git a/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py b/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py index 9159f11c0eefd46569b1d434aaa8f929a65d5173..ac2edbe0181430922970cc0019113dcafecd46c8 100644 --- a/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py +++ b/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py @@ -985,6 +985,8 @@ class ReflGui(QtGui.QMainWindow, refl_window.Ui_windowRefl): if ',' in runno: runno = runno.split(',')[0] inst = wq.getInstrument() + #NOTE: In the new Refl UI, these adjustments to lmin/lmax are NOT made. This has been + #noted in the parameter files for INTER/CRIST/POLREF/SURF. lmin = inst.getNumberParameter('LambdaMin')[0] + 1 lmax = inst.getNumberParameter('LambdaMax')[0] - 2 qmin = 4 * math.pi / lmax * math.sin(th * math.pi / 180)