Implement general powder reduction GUI. Refs #6555.

mantidproject · Mar 14, 2013 · 0677897 · 0677897
1 parent d5bb90a
commit 0677897
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/...tid/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py b/...tid/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
@@ -102,6 +102,9 @@ def constructPythonScript(self, paramdict):
 
         # 2. Obtain some information
         datafilenames = self.getDataFileNames(runsetupdict)
+        if len(datafilenames) == 0:
+            raise NotImplementedError("RunNumber cannot be neglected. ")
+
         dofilter = self.doFiltering(filterdict)
 
         # 3. Header
@@ -129,8 +132,6 @@ def constructPythonScript(self, paramdict):
 
                 script += "\n"
 
-                print "Stage 1\n", script, "\n"
-
                 # ii. Generate event filters
                 script += "# Construct the event filters\n"
                 script += "GenerateEventsFilter(\n"
@@ -151,16 +152,20 @@ def constructPythonScript(self, paramdict):
                     # Filter by log value
                     script += "%sLogName = '%s',\n" % (DiffractionReductionScripter.WIDTH, filterdict["LogName"])
                     if filterdict["MinimumLogValue"] != "": 
-                        script += "%sMinimumLogValue = '%s',\n" % (DiffractionReductionScripter.WIDTH, filterdict["MinimumLogValue"])
+                        script += "%sMinimumLogValue    = '%s',\n" % (DiffractionReductionScripter.WIDTH, filterdict["MinimumLogValue"])
                     if filterdict["MaximumLogValue"] != "": 
-                        script += "%sMaximumLogValue = '%s',\n" % (DiffractionReductionScripter.WIDTH, filterdict["MaximumLogValue"])
+                        script += "%sMaximumLogValue    = '%s',\n" % (DiffractionReductionScripter.WIDTH, filterdict["MaximumLogValue"])
                     script += "%sFilterLogValueByChangingDirection = '%s',\n" % (DiffractionReductionScripter.WIDTH, 
                             filterdict["FilterLogValueByChangingDirection"])
-                script += ")\n"
-
-                print "Stage 2\n", script, "\n"
-
+                    if filterdict["LogValueInterval"] != "":
+                        script += "%sInterval       = '%s',\n" % (DiffractionReductionScripter.WIDTH, filterdict["LogValueInterval"])
+                    script += "%sLogBoundary    = '%s',\n" % (DiffractionReductionScripter.WIDTH, filterdict["LogBoundary"])
+                    if filterdict["TimeTolerance"] != "":
+                        script += "%sTimeTolerance  = '%s',\n" % (DiffractionReductionScripter.WIDTH, filterdict["TimeTolerance"])
+                    if filterdict["LogValueTolerance"] != "":
+                        script += "%sLogValueTolerance  = '%s',\n" % (DiffractionReductionScripter.WIDTH, filterdict["LogValueTolerance"])
                 # ENDIF
+                script += ")\n"
 
                 # iii. Data reduction
                 script += self.buildPowderDataReductionScript(runsetupdict, advsetupdict, runnumber, splitwsname)

diff --git a/...tid/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py b/...tid/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py
@@ -167,7 +167,7 @@ def from_xml(self, xml_str):
 
             # 
             self.runnumbers = BaseScriptElement.getStringElement(instrument_dom, 
-                    "runnumbers", default=RunSetupScript.runnumbers)
+                    "runnumber", default=RunSetupScript.runnumbers)
 
             self.extension = BaseScriptElement.getStringElement(instrument_dom, 
                     "extension", default=RunSetupScript.extension)