Better use of property types

Refs #10064
mantidproject · Aug 13, 2014 · 70d10da · 70d10da
1 parent 0f1b4c8
commit 70d10da
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/...tid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py b/...tid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py
@@ -8,18 +8,24 @@ class IndirectResolution(DataProcessorAlgorithm):
 
     def PyInit(self):
         self.declareProperty(FileProperty('InputFiles', '',
-                                          action=FileAction.Load,                                          
-                                          extensions=['raw']))
+            action=FileAction.Load,
+            extensions=['raw']))
 
-        self.declareProperty(WorkspaceProperty('OutputWorkspace', '', 
-                                                     direction=Direction.Output))
+        self.declareProperty(WorkspaceProperty('OutputWorkspace', '',
+            direction=Direction.Output))
 
-        self.declareProperty(name='Instrument', defaultValue='', doc='')
-        self.declareProperty(name='Analyser', defaultValue='', doc='')
-        self.declareProperty(name='Reflection', defaultValue='', doc='')
+        self.declareProperty(name='Instrument', defaultValue='', doc='Instrument used during run',
+            validator=StringListValidator(['IRIS', 'OSIRIS', 'TOSCA']))
+        self.declareProperty(name='Analyser', defaultValue='', doc='Analyser used during run',
+            validator=StringListValidator(['graphite', 'mica', 'fmica']))
+        self.declareProperty(name='Reflection', defaultValue='', doc='Reflection used during run',
+            validator=StringListValidator(['002', '004', '006']))
+
+        self.declareProperty(IntArrayProperty(name='DetectorRange', values=[0, 1]),
+            doc='')
+        self.declareProperty(FloatArrayProperty(name='BackgroundRange', values=[0, 0]),
+            doc='')
 
-        self.declareProperty(name='DetectorRange', defaultValue='', doc='')
-        self.declareProperty(name='BackgroundRange', defaultValue='', doc='')
         self.declareProperty(name='RebinString', defaultValue='', doc='')
         self.declareProperty(name='ScaleFactor', defaultValue=1.0, doc='')
 
@@ -44,8 +50,8 @@ def PyExec(self):
         analyser = self.getProperty('Analyser').value
         reflection = self.getProperty('Reflection').value
 
-        detector_range = self.getProperty('DetectorRange').value.split(',')
-        bground = self.getProperty('BackgroundRange').value.split(',')
+        detector_range = self.getProperty('DetectorRange').value
+        bground = self.getProperty('BackgroundRange').value
         rebin_string = self.getProperty('RebinString').value
         scale_factor = self.getProperty('ScaleFactor').value
 
@@ -54,9 +60,10 @@ def PyExec(self):
         plot = self.getProperty('Plot').value
         save = self.getProperty('Save').value
 
+        #TODO: Replace with InelasticIndirectReduction algorithm
         reducer = inelastic_indirect_reducer.IndirectReducer()
         reducer.set_instrument_name(instrument)
-        reducer.set_detector_range(int(detector_range[0])-1, int(detector_range[1])-1)
+        reducer.set_detector_range(detector_range[0]-1, detector_range[1]-1)
         for in_file in input_files:
             reducer.append_data_file(in_file)
         parfile = config['instrumentDefinition.directory']
@@ -79,7 +86,7 @@ def PyExec(self):
 
         if res:
             name = getWSprefix(icon_ws) + 'res'
-            CalculateFlatBackground(InputWorkspace=icon_ws, OutputWorkspace=name, StartX=float(bground[0]), EndX=float(bground[1]),
+            CalculateFlatBackground(InputWorkspace=icon_ws, OutputWorkspace=name, StartX=bground[0], EndX=bground[1],
                 Mode='Mean', OutputMode='Subtract Background')
             Rebin(InputWorkspace=name, OutputWorkspace=name, Params=rebin_string)
 

diff --git a/Code/Mantid/docs/source/algorithms/IndirectResolution-v1.rst b/Code/Mantid/docs/source/algorithms/IndirectResolution-v1.rst
@@ -11,7 +11,6 @@ Description
 
 TODO
 
-
 See `Indirect:Calibration <http://www.mantidproject.org/Indirect:Calibration>`_.
 
 .. categories::