diff --git a/Framework/Algorithms/src/SmoothNeighbours.cpp b/Framework/Algorithms/src/SmoothNeighbours.cpp index c49e29e6d6c6884d3fe7bbfcc7f3cc1c059e4ad7..0b2be8ed676500881f37cca259968d3fc59d53a4 100644 --- a/Framework/Algorithms/src/SmoothNeighbours.cpp +++ b/Framework/Algorithms/src/SmoothNeighbours.cpp @@ -135,19 +135,24 @@ void SmoothNeighbours::init() { declareProperty( "RadiusUnits", "Meters", boost::make_shared<StringListValidator>(radiusPropOptions), - "Units used to specify the radius?\n" + "Units used to specify the radius.\n" " Meters : Radius is in meters.\n" " NumberOfPixels : Radius is in terms of the number of pixels."); declareProperty( "Radius", 0.0, mustBePositiveDouble, - "The radius around a pixel to look for nearest neighbours to average. \n" + "The radius cut-off around a pixel to look for nearest neighbours to " + "average. \n" + "This radius cut-off is applied to a set of nearest neighbours whose " + "number is " + "defined in the NumberOfNeighbours property. See below for more details. " + "\n" "If 0, will use the AdjX and AdjY parameters for rectangular detectors " "instead."); declareProperty("NumberOfNeighbours", 8, mustBePositive, "Number of nearest neighbouring pixels.\n" - "Alternative to providing the radius. The default is 8."); + "The default is 8."); declareProperty("SumNumberOfNeighbours", 1, "Sum nearest neighbouring pixels with same parent.\n" diff --git a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py index 7c5f44729e2f80775a540387bce93d46175188a0..d4978816f9df69e8d9df1df8a804f7d9a89a884d 100644 --- a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py +++ b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py @@ -704,7 +704,7 @@ class SNSPowderReduction(DataProcessorAlgorithm): if sample_ws_name is None: # sample run workspace is not set up. sample_ws_name = ws_name - info = tempinfo + self._info = tempinfo else: # there is sample run workspace set up previously, then add current one to previous for summation self.checkInfoMatch(info, tempinfo) @@ -999,6 +999,10 @@ class SNSPowderReduction(DataProcessorAlgorithm): assert isinstance(wksp_name, str) assert self.does_workspace_exist(wksp_name) + # Reset characterization run numbers in the property manager + if PropertyManagerDataService.doesExist('__snspowderreduction'): + PropertyManagerDataService.remove('__snspowderreduction') + # Determine characterization api.PDDetermineCharacterizations(InputWorkspace=wksp_name, Characterizations=self._charTable,