Refs #8778 Added bool variable to perform local regression

mantidproject · Feb 7, 2014 · be02deb · be02deb
1 parent 7409cf1
commit be02deb
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/DSFinterp.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/DSFinterp.py
@@ -41,8 +41,13 @@ def PyInit(self):
     arrvalidator = StringArrayMandatoryValidator()
     self.declareProperty(StringArrayProperty('Workspaces', values=[], validator=arrvalidator, direction=Direction.Input), doc='list of input workspaces')
     self.declareProperty(FloatArrayProperty('ParameterValues', values=[], direction=Direction.Input), doc='list of input parameter values')
-    self.declareProperty('RegressionWindow',0, direction=Direction.Input, doc='window for the running local-regression. No regression if value set to zero')
-    self.declareProperty('RegressionType','linear',direction=Direction.Input, doc='type of local-regression; linear and quadratic are available')
+    self.declareProperty('LocalRegression', True, direction=Direction.Input, doc='Perform running local-regression?')
+    self.declareProperty('RegressionWindow', 3, direction=Direction.Input, doc='window size for the running local-regression')
+    self.declareProperty('RegressionType', 'linear', direction=Direction.Input, doc='type of local-regression; linear and quadratic are available')
+    lrg = 'Running Local Regression'
+    #self.setPropertyGroup('LocalRegression', lrg)
+    #self.setPropertyGroup('RegressionWindow', lrg)
+    #self.setPropertyGroup('RegressionType', lrg)
     self.declareProperty(FloatArrayProperty('TargetParameters', values=[], direction=Direction.Input), doc="Parameters to interpolate the structure factor")
     self.declareProperty(StringArrayProperty('OutputWorkspaces', values=[], validator=arrvalidator, direction=Direction.Input), doc='list of output workspaces to save the interpolated structure factors')
     self.channelgroup = None
@@ -77,9 +82,13 @@ def PyExec(self):
     if not self.channelgroup:
       self.channelgroup = ChannelGroup()
       self.channelgroup.InitFromDsfGroup(dsfgroup)
-      regressiontype = self.getProperty('RegressionType').value
-      windowlength = self.getProperty('RegressionWindow').value
-      self.channelgroup.InitializeInterpolator(running_regr_type=regressiontype, windowlength=windowlength)
+      localregression = self.getProperty('LocalRegression').value
+      if localregression:
+        regressiontype = self.getProperty('RegressionType').value
+        windowlength = self.getProperty('RegressionWindow').value
+        self.channelgroup.InitializeInterpolator(running_regr_type=regressiontype, windowlength=windowlength)
+      else:
+        self.channelgroup.InitializeInterpolator(windowlength=0)
     # Invoke the interpolator and generate the output workspaces
     targetfvalues = self.getProperty('TargetParameters').value
     for targetfvalue in targetfvalues: