Fixed bug in value of slits height and width loaded from the config f…

…ile name. This refs #4303
mantidproject · Jun 8, 2012 · 91c3264 · 91c3264
1 parent 2fd6f57
commit 91c3264
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...scripts/Interface/reduction_gui/reduction/reflectometer/refl_sf_calculator_data_script.py b/...scripts/Interface/reduction_gui/reduction/reflectometer/refl_sf_calculator_data_script.py
@@ -124,8 +124,8 @@ def from_xml_element(self, instrument_dom):
 
         #s1h, s2h, s1w, s2w
         self.s1h = BaseScriptElement.getStringElement(instrument_dom, "s1h")
-        self.s2h = BaseScriptElement.getStringElement(instrument_dom, "s1w")
-        self.s1w = BaseScriptElement.getStringElement(instrument_dom, "s2h")
+        self.s2h = BaseScriptElement.getStringElement(instrument_dom, "s2h")
+        self.s1w = BaseScriptElement.getStringElement(instrument_dom, "s1w")
         self.s2w = BaseScriptElement.getStringElement(instrument_dom, "s2w")
 
         #scaling factor file

diff --git a/Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refl_sf_calculator.py b/Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refl_sf_calculator.py
@@ -489,7 +489,7 @@ def getSh(self,mt, top_tag, bottom_tag):
         mt_run = mt.getRun()
         st = mt_run.getProperty(top_tag).value
         sb = mt_run.getProperty(bottom_tag).value
-        sh = float(sb[0]) - float(st[0])
+        sh = math.fabs(float(sb[0]) - float(st[0]))
         units = mt_run.getProperty(top_tag).units
         return sh, units
 
@@ -518,7 +518,7 @@ def getSw(self,mt, left_tag, right_tag):
         mt_run = mt.getRun()
         sl = mt_run.getProperty(left_tag).value
         sr = mt_run.getProperty(right_tag).value
-        sw = float(sl[0]) - float(sr[0])
+        sw = math.fabs(float(sl[0]) - float(sr[0])
         units = mt_run.getProperty(left_tag).units
         return sw, units
 

diff --git a/Code/Mantid/scripts/reduction/instruments/reflectometer/wks_utility.py b/Code/Mantid/scripts/reduction/instruments/reflectometer/wks_utility.py
@@ -61,7 +61,7 @@ def getSh(mt, top_tag, bottom_tag):
     mt_run = mt.getRun()
     st = mt_run.getProperty(top_tag).value
     sb = mt_run.getProperty(bottom_tag).value
-    sh = float(sb[0]) - float(st[0])
+    sh = math.fabs(float(sb[0]) - float(st[0]))
     units = mt_run.getProperty(top_tag).units
     return sh, units
 
@@ -90,7 +90,7 @@ def getSw(mt, left_tag, right_tag):
     mt_run = mt.getRun()
     sl = mt_run.getProperty(left_tag).value
     sr = mt_run.getProperty(right_tag).value
-    sw = float(sl[0]) - float(sr[0])
+    sw = math.fabs(float(sl[0]) - float(sr[0]))
     units = mt_run.getProperty(left_tag).units
     return sw, units