Use the new ArrayBoundedValidator constructor in algorithms. Re #9777

mantidproject · Mar 11, 2019 · 413f265 · 413f265
1 parent a1f4a68
commit 413f265
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 59 deletions.
diff --git a/Framework/DataHandling/src/SaveGSS.cpp b/Framework/DataHandling/src/SaveGSS.cpp
@@ -190,9 +190,7 @@ void SaveGSS::init() {
 
   auto must_be_3 = boost::make_shared<Kernel::ArrayLengthValidator<int>>(3);
   auto precision_range =
-      boost::make_shared<Kernel::ArrayBoundedValidator<int>>();
-  precision_range->setLower(0);
-  precision_range->setUpper(10);
+      boost::make_shared<Kernel::ArrayBoundedValidator<int>>(0, 10);
 
   auto precision_validator = boost::make_shared<Kernel::CompositeValidator>();
   precision_validator->add(must_be_3);

diff --git a/Framework/MDAlgorithms/src/SetMDFrame.cpp b/Framework/MDAlgorithms/src/SetMDFrame.cpp
@@ -85,7 +85,6 @@ void SetMDFrame::init() {
 
   auto axisValidator =
       boost::make_shared<Mantid::Kernel::ArrayBoundedValidator<int>>();
-  axisValidator->clearUpper();
   axisValidator->setLower(0);
   declareProperty(
       Kernel::make_unique<Kernel::ArrayProperty<int>>(

diff --git a/Framework/MDAlgorithms/src/TransposeMD.cpp b/Framework/MDAlgorithms/src/TransposeMD.cpp
@@ -62,7 +62,6 @@ void TransposeMD::init() {
                   "An input workspace.");
 
   auto axisValidator = boost::make_shared<ArrayBoundedValidator<int>>();
-  axisValidator->clearUpper();
   axisValidator->setLower(0);
 
   declareProperty(

diff --git a/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py b/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py
@@ -71,8 +71,7 @@ def PyInit(self):
         self.declareProperty(MultipleFileProperty(name="RunNumber",
                                                   extensions=EXTENSIONS_NXS),
                              "Event file")
-        validator = IntArrayBoundedValidator()
-        validator.setLower(0)
+        validator = IntArrayBoundedValidator(lower=0)
         self.declareProperty(IntArrayProperty("Background", values=[0], direction=Direction.Input,
                                               validator=validator))
         self.declareProperty("XPixelSum", 1,
@@ -91,8 +90,7 @@ def PyInit(self):
                              "Maximum absolute value of offsets; default is 1")
         self.declareProperty("CrossCorrelation", True,
                              "CrossCorrelation if True; minimize using many peaks if False.")
-        validator = FloatArrayBoundedValidator()
-        validator.setLower(0.)
+        validator = FloatArrayBoundedValidator(lower=0.)
         self.declareProperty(FloatArrayProperty("PeakPositions", []),
                              "Comma delimited d-space positions of reference peaks.  Use 1-3 for Cross Correlation.  "+
                              "Unlimited for many peaks option.")

diff --git a/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py b/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py
@@ -44,8 +44,7 @@ def __load(self, directory, instr, run, loader, exts, wksp):
         raise RuntimeError("Failed to load run %s from file %s" % (str(run), filename))
 
     def PyInit(self):
-        greaterThanZero = IntArrayBoundedValidator()
-        greaterThanZero.setLower(0)
+        greaterThanZero = IntArrayBoundedValidator(lower=0)
         self.declareProperty(IntArrayProperty("RunNumbers",values=[0],validator=greaterThanZero), doc="Run numbers")
         self.declareProperty(WorkspaceProperty("OutputWorkspace", "", direction=Direction.Output))
         self.declareProperty(FileProperty("Directory", "", FileAction.OptionalDirectory))

diff --git a/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py b/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
@@ -47,8 +47,7 @@ def PyInit(self):
         self.declareProperty("GenerateBraggReflections", False,
                              "Generate Bragg reflections other than reading a Fullprof .irf file. ")
 
-        arrvalidator = IntArrayBoundedValidator()
-        arrvalidator.setLower(0)
+        arrvalidator = IntArrayBoundedValidator(lower=0)
         self.declareProperty(IntArrayProperty("MaxHKL", values=[12, 12, 12], validator=arrvalidator,
                                               direction=Direction.Input), "Maximum reflection (HKL) to generate")
 

diff --git a/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py b/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py
@@ -43,8 +43,7 @@ def PyInit(self):
         self.declareProperty("Shape", "sphere", doc="Shape to cut out reflections",
                              validator=StringListValidator(['sphere', 'cube']))
         self.setPropertySettings("Shape", condition)
-        val_min_zero = FloatArrayBoundedValidator()
-        val_min_zero.setLower(0.)
+        val_min_zero = FloatArrayBoundedValidator(lower=0.)
         self.declareProperty(FloatArrayProperty("Size", [0.2], validator=val_min_zero),
                              "Width of cube/diameter of sphere used to remove reflections, in (HKL) (one or three values)")
         self.setPropertySettings("Size", condition)

diff --git a/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py b/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
@@ -86,8 +86,7 @@ def PyInit(self):
         self.declareProperty("ProcessBackground", False, "Option to process background from input data file.")
         backgroundtypes = ["Polynomial", "Chebyshev", "FullprofPolynomial"]
         self.declareProperty("BackgroundType", "Polynomial", StringListValidator(backgroundtypes), "Type of background.")
-        arrvalidator = FloatArrayBoundedValidator()
-        arrvalidator.setLower(0.)
+        arrvalidator = FloatArrayBoundedValidator(lower=0.)
         self.declareProperty(FloatArrayProperty("BackgroundPoints", values=[], validator=arrvalidator, direction=Direction.Input),
                              "User specified X/TOF values of the data points to calculate background.")
         self.declareProperty(MatrixWorkspaceProperty("BackgroundWorkspace", "", Direction.Output, PropertyMode.Optional),

diff --git a/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py b/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py
@@ -46,8 +46,7 @@ def __load(self, directory, prefix):
 
     def PyInit(self):
         self.declareProperty("FilePrefix","")
-        intArrayValidator = IntArrayBoundedValidator()
-        intArrayValidator.setLower(0)
+        intArrayValidator = IntArrayBoundedValidator(lower=0)
         self.declareProperty(IntArrayProperty("RunNumbers",[0], validator=intArrayValidator))
         self.declareProperty(FileProperty("Directory", "", action=FileAction.OptionalDirectory))
 

diff --git a/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py b/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py
@@ -113,8 +113,7 @@ def category(self):
         return "Diffraction\\Reduction"
 
     def PyInit(self):
-        validator = IntArrayBoundedValidator()
-        validator.setLower(0)
+        validator = IntArrayBoundedValidator(lower=0)
         self.declareProperty(IntArrayProperty("RunNumbers", values=[0], direction=Direction.Input,
                                               validator=validator),
                              "Run numbers to process, comma separated")

diff --git a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
@@ -164,20 +164,13 @@ def PyInit(self):
         self.declareProperty("PushDataPositive", "None",
                              StringListValidator(["None", "ResetToZero", "AddMinimum"]),
                              "Add a constant to the data that makes it positive over the whole range.")
-        arrvalidatorBack = IntArrayBoundedValidator()
-        arrvalidatorBack.setLower(-1)
-        self.declareProperty(IntArrayProperty("BackgroundNumber", values=[0], validator=arrvalidatorBack),
+        arrvalidator = IntArrayBoundedValidator(lower=-1)
+        self.declareProperty(IntArrayProperty("BackgroundNumber", values=[0], validator=arrvalidator),
                              doc="If specified overrides value in CharacterizationRunsFile If -1 turns off correction.")
-        arrvalidatorVan = IntArrayBoundedValidator()
-        arrvalidatorVan.setLower(-1)
-        self.declareProperty(IntArrayProperty("VanadiumNumber", values=[0], validator=arrvalidatorVan),
-                             doc="If specified overrides value in CharacterizationRunsFile. If -1 turns off correction."
-                                 "")
-        arrvalidatorVanBack = IntArrayBoundedValidator()
-        arrvalidatorVanBack.setLower(-1)
-        self.declareProperty(IntArrayProperty("VanadiumBackgroundNumber", values=[0], validator=arrvalidatorVanBack),
-                             doc="If specified overrides value in CharacterizationRunsFile. If -1 turns off correction."
-                                 "")
+        self.declareProperty(IntArrayProperty("VanadiumNumber", values=[0], validator=arrvalidator),
+                             doc="If specified overrides value in CharacterizationRunsFile. If -1 turns off correction.")
+        self.declareProperty(IntArrayProperty("VanadiumBackgroundNumber", values=[0], validator=arrvalidator),
+                             doc="If specified overrides value in CharacterizationRunsFile. If -1 turns off correction.")
         self.declareProperty(FileProperty(name="CalibrationFile",defaultValue="",action=FileAction.OptionalLoad,
                                           extensions=[".h5", ".hd5", ".hdf", ".cal"]))  # CalFileName
         self.declareProperty(FileProperty(name="GroupingFile",defaultValue="",action=FileAction.OptionalLoad,

diff --git a/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py b/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
@@ -45,8 +45,7 @@ def summary(self):
     def PyInit(self):
         self.declareProperty(ITableWorkspaceProperty('InputWorkspace', '', Direction.Input),
                              doc='Input table workspace.')
-        validator = IntArrayBoundedValidator()
-        validator.setLower(0)
+        validator = IntArrayBoundedValidator(lower=0)
         self.declareProperty(
             IntArrayProperty('ColumnIndices', values=[], direction=Direction.Input, validator=validator),
             'Comma separated list of column indices for which statistics will be separated')

diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioPeakPrediction.py b/Framework/PythonInterface/plugins/algorithms/VesuvioPeakPrediction.py
@@ -38,8 +38,7 @@ def PyInit(self):
                              validator=StringListValidator(['Debye', 'Einstein']),
                              doc='Model used to make predictions')
 
-        arrvalid = FloatArrayBoundedValidator()
-        arrvalid.setLower(0.0)
+        arrvalid = FloatArrayBoundedValidator(lower=0.)
 
         self.declareProperty(FloatArrayProperty(name='Temperature', validator=arrvalid),
                              doc='Temperature (K)')

diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py
@@ -35,8 +35,7 @@ def PyInit(self):
                                                      validator=WorkspaceUnitValidator("Wavelength")),
                              doc='Flood weighting measurement')
 
-        validator = FloatArrayBoundedValidator()
-        validator.setLower(0.)
+        validator = FloatArrayBoundedValidator(lower=0.)
         self.declareProperty(FloatArrayProperty('Bands', [], direction=Direction.Input, validator=validator),
                              doc='Wavelength bands to use. Single pair min to max.')
 

diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py
@@ -12,7 +12,7 @@
 from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, FileAction, InstrumentValidator,
                         ITableWorkspaceProperty, MatrixWorkspaceProperty, MultipleFileProperty, Progress, PropertyMode,
                         WorkspaceProperty, WorkspaceUnitValidator)
-from mantid.kernel import (CompositeValidator, Direct, Direction, FloatBoundedValidator, IntBoundedValidator, IntArrayBoundedValidator,
+from mantid.kernel import (CompositeValidator, Direct, Direction, FloatBoundedValidator, IntBoundedValidator,
                            IntMandatoryValidator, Property, StringListValidator, UnitConversion)
 from mantid.simpleapi import (AddSampleLog, CalculateFlatBackground, CloneWorkspace, CorrectTOFAxis, CreateEPP,
                               CreateSingleValuedWorkspace, CreateWorkspace, CropWorkspace, DeleteWorkspace, Divide, ExtractMonitors,
@@ -354,8 +354,6 @@ def PyInit(self):
         mandatoryPositiveInt.add(IntBoundedValidator(lower=0))
         positiveFloat = FloatBoundedValidator(lower=0)
         positiveInt = IntBoundedValidator(lower=0)
-        positiveIntArray = IntArrayBoundedValidator()
-        positiveIntArray.setLower(0)
         inputWorkspaceValidator = CompositeValidator()
         inputWorkspaceValidator.add(InstrumentValidator())
         inputWorkspaceValidator.add(WorkspaceUnitValidator('TOF'))

diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py
@@ -420,8 +420,7 @@ def PyInit(self):
         inputWorkspaceValidator.add(InstrumentValidator())
         inputWorkspaceValidator.add(WorkspaceUnitValidator('TOF'))
         positiveFloat = FloatBoundedValidator(lower=0)
-        positiveIntArray = IntArrayBoundedValidator()
-        positiveIntArray.setLower(0)
+        positiveIntArray = IntArrayBoundedValidator(lower=0)
         scalingFactor = FloatBoundedValidator(lower=0, upper=1)
 
         # Properties.

diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py
@@ -60,8 +60,7 @@ def PyInit(self):
                              validator=StringListValidator(['IRIS', 'OSIRIS']),
                              doc='Instrument used during run.')
 
-        int_arr_valid = IntArrayBoundedValidator()
-        int_arr_valid.setLower(0)
+        int_arr_valid = IntArrayBoundedValidator(lower=0)
 
         self.declareProperty(IntArrayProperty(name='SpectraRange', values=[0, 1],
                                               validator=int_arr_valid),

diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py
@@ -128,8 +128,7 @@ def PyInit(self):
                                  'relative calibration constants; for example, the beam stop [degrees]. ')
 
         pixelRangeValidator = CompositeValidator()
-        greaterThanOne = IntArrayBoundedValidator()
-        greaterThanOne.setLower(1)
+        greaterThanOne = IntArrayBoundedValidator(lower=1)
         lengthTwo = IntArrayLengthValidator()
         lengthTwo.setLength(2)
         orderedPairsValidator = IntArrayOrderedPairsValidator()

diff --git a/...ework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py b/...ework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py
@@ -141,8 +141,7 @@ def PyInit(self):
         """Initialize the input and output properties of the algorithm."""
         nonnegativeInt = IntBoundedValidator(lower=0)
         wsIndexRange = IntBoundedValidator(lower=0, upper=255)
-        nonnegativeIntArray = IntArrayBoundedValidator()
-        nonnegativeIntArray.setLower(0)
+        nonnegativeIntArray = IntArrayBoundedValidator(lower=0)
         maxTwoNonnegativeInts = CompositeValidator()
         maxTwoNonnegativeInts.add(IntArrayLengthValidator(lenmin=0, lenmax=2))
         maxTwoNonnegativeInts.add(nonnegativeIntArray)

diff --git a/...rk/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py b/...rk/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py
@@ -94,11 +94,9 @@ def PyInit(self):
         """Initialize the input and output properties of the algorithm."""
         threeNonnegativeInts = CompositeValidator()
         threeNonnegativeInts.add(IntArrayLengthValidator(3))
-        nonnegativeInts = IntArrayBoundedValidator()
-        nonnegativeInts.setLower(0)
+        nonnegativeInts = IntArrayBoundedValidator(lower=0)
         threeNonnegativeInts.add(nonnegativeInts)
-        nonnegativeFloatArray = FloatArrayBoundedValidator()
-        nonnegativeFloatArray.setLower(0.)
+        nonnegativeFloatArray = FloatArrayBoundedValidator(lower=0.)
         inWavelength = WorkspaceUnitValidator('Wavelength')
         self.declareProperty(
             MatrixWorkspaceProperty(

diff --git a/.../PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py b/.../PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py
@@ -41,8 +41,7 @@ def PyInit(self):
         self.declareProperty("ApplyToDetectors", True, "If True then we apply the correction to the detector pixels")
         self.declareProperty("ApplyToMonitors", False, "If True then we apply the correction to the monitors")
 
-        arrvalidator = IntArrayBoundedValidator()
-        arrvalidator.setLower(0)
+        arrvalidator = IntArrayBoundedValidator(lower=0)
         self.declareProperty(IntArrayProperty("SelectedMonitors", values=[],
                                               validator=arrvalidator,
                                               direction=Direction.Input),

diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
@@ -39,8 +39,7 @@ def summary(self):
         return "Perform USANS data reduction"
 
     def PyInit(self):
-        arrvalidator = IntArrayBoundedValidator()
-        arrvalidator.setLower(0)
+        arrvalidator = IntArrayBoundedValidator(lower=0)
         self.declareProperty(IntArrayProperty("RunNumbers", values=[0], validator=arrvalidator,
                                               direction=Direction.Input), "Runs to reduce")
         self.declareProperty("EmptyRun", '', "Run number for the empty run")