Re #10545. Removed IncreasingDataValidator.

mantidproject · Nov 19, 2014 · edd88dc · edd88dc
1 parent 8f38811
commit edd88dc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 47 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceValidators.h b/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceValidators.h
@@ -369,44 +369,6 @@ class DLLExport IncreasingAxisValidator : public MatrixWorkspaceValidator
   }
 };
 
-//===============================================================================================
-/**
- * A validator which checks whether data in each spectrum of the input workspace are monotonically increasing.
- */
-class DLLExport IncreasingDataValidator : public MatrixWorkspaceValidator
-{
-public:
-  ///Gets the type of the validator
-  std::string getType() const { return "increasingdata"; }
-  /// Clone the current state
-  Kernel::IValidator_sptr clone() const { return boost::make_shared<IncreasingDataValidator>(*this); }
-
-private:
-  /** Validate a workspace.
-  *  @param value :: The workspace to test
-  *  @return A message for users with negative results, otherwise ""
-  */
-  std::string checkValidity( const MatrixWorkspace_sptr& value ) const
-  {
-    if ( value->blocksize() < 2 ) 
-    {
-      return "Spectra must have two or more data points (bins).";
-    }
-    for(size_t spec = 0; spec < value->getNumberHistograms(); ++spec)
-    {
-      auto &Y = value->readY( spec );
-      double y = Y.front();
-      for(auto it = Y.begin() + 1; it != Y.end(); ++it)
-      {
-        if ( y > *it ) return "Data in the workspace must monotonically increase.";
-        y = *it;
-      }
-    }
-    return "";
-  }
-
-};
-
 } // namespace API
 } // namespace Mantid
 

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/IntegrateFlux.cpp b/Code/Mantid/Framework/MDAlgorithms/src/IntegrateFlux.cpp
@@ -158,7 +158,7 @@ class NoEventWorkspaceDeleting
   }
 
   /**
-   * Integrate spectra in eventWS at x-values in integrWS and save the results in y-vectors of integrWS.
+   * Integrate spectra in inputWS at x-values in integrWS and save the results in y-vectors of integrWS.
    * @param inputWS :: An event workspace to integrate.
    * @param integrWS :: A workspace to store the results.
    */
@@ -195,7 +195,7 @@ class NoEventWorkspaceDeleting
   }
 
   /**
-   * Integrate spectra in eventWS at x-values in integrWS and save the results in y-vectors of integrWS.
+   * Integrate spectra in inputWS at x-values in integrWS and save the results in y-vectors of integrWS.
    * @param inputWS :: A 2d workspace to integrate.
    * @param integrWS :: A workspace to store the results.
    */
@@ -214,7 +214,7 @@ class NoEventWorkspaceDeleting
   }
 
   /**
-   * Integrate spectra in eventWS at x-values in integrWS and save the results in y-vectors of integrWS.
+   * Integrate spectra in inputWS at x-values in integrWS and save the results in y-vectors of integrWS.
    * @param inputWS :: A 2d workspace to integrate.
    * @param integrWS :: A workspace to store the results.
    */
@@ -346,7 +346,7 @@ class NoEventWorkspaceDeleting
   }
 
   /**
-   * Integrate spectra in eventWS at x-values in integrWS and save the results in y-vectors of integrWS.
+   * Integrate spectra in inputWS at x-values in integrWS and save the results in y-vectors of integrWS.
    * @param inputWS :: A 2d workspace to integrate.
    * @param integrWS :: A workspace to store the results.
    */

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/MDNormSXD.cpp
@@ -97,7 +97,6 @@ namespace MDAlgorithms
       fluxValidator->add<InstrumentValidator>();
       fluxValidator->add<CommonBinsValidator>();
       auto solidAngleValidator = fluxValidator->clone();
-      fluxValidator->add<IncreasingDataValidator>();
 
       declareProperty(new WorkspaceProperty<>("FluxWorkspace","",Direction::Input,fluxValidator), "An input workspace containing integrated momentum dependent flux.");
       declareProperty(new WorkspaceProperty<>("SolidAngleWorkspace","",Direction::Input,solidAngleValidator), "An input workspace containing momentum integrated vanadium (a measure of the solid angle).");

diff --git a/Code/Mantid/docs/source/algorithms/IntegrateFlux-v1.rst b/Code/Mantid/docs/source/algorithms/IntegrateFlux-v1.rst
@@ -15,8 +15,6 @@ the output workspace has its indefinite integral:
 
 :math:`\int_{x_0}^x f(\xi)d\xi`.
 
-The input workspace is expected to be an event workspace with weighted-no-time events.
-
 
 Usage
 -----
@@ -27,8 +25,6 @@ Usage
 
     # Create an event workspace
     ws = CreateSampleWorkspace("Event")
-    # Make evet type weighted-no-time.
-    ws = CompressEvents( ws )
     # Integrate all spectra.
     wsOut = IntegrateFlux( ws )