diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h index b1f3be04a836d408780db38b53e347bfb3af4cec..a11a01e463b5584b5ee45f701cd48c836cc0bc79 100644 --- a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h +++ b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h @@ -73,15 +73,6 @@ private: Mantid::API::MatrixWorkspace_sptr integration(Mantid::API::MatrixWorkspace_sptr &input, const double &start, const double &stop); - /// Perform multiplication over a range - Mantid::API::MatrixWorkspace_sptr - multiplyRange(Mantid::API::MatrixWorkspace_sptr &input, const int &startBin, - const int &endBin, const double &factor); - /// Perform multiplication over a range - Mantid::API::MatrixWorkspace_sptr - multiplyRange(Mantid::API::MatrixWorkspace_sptr &input, const int &startBin, - const double &factor); - /// Create a single valued workspace Mantid::API::MatrixWorkspace_sptr singleValueWS(double val); /// Calclate the weighted mean Mantid::API::MatrixWorkspace_sptr diff --git a/Framework/Algorithms/src/Stitch1D.cpp b/Framework/Algorithms/src/Stitch1D.cpp index 05d0eef3bc2cfa36da72ef8eca1b937247762a4f..dd2b7ff8d8d65d51beb8cbc36cbb46d0339cb687 100644 --- a/Framework/Algorithms/src/Stitch1D.cpp +++ b/Framework/Algorithms/src/Stitch1D.cpp @@ -145,7 +145,7 @@ void Stitch1D::init() { "input workspaces."); declareProperty(make_unique<PropertyWithValue<bool>>("ScaleRHSWorkspace", true, Direction::Input), - "Scaling either with respect to workspace 1 or workspace 2"); + "Scaling either with respect to LHS workspace or RHS workspace"); declareProperty(make_unique<PropertyWithValue<bool>>("UseManualScaleFactor", false, Direction::Input), "True to use a provided value for the scale factor."); @@ -280,7 +280,7 @@ std::vector<double> Stitch1D::getRebinParams(MatrixWorkspace_sptr &lhsWS, return result; } -/**Runs the Rebin Algorithm as a child +/**Runs the Rebin Algorithm as a child and replaces special values @param input :: The input workspace @param params :: a vector<double> containing rebinning parameters @return A shared pointer to the resulting MatrixWorkspace @@ -360,52 +360,6 @@ MatrixWorkspace_sptr Stitch1D::integration(MatrixWorkspace_sptr &input, return outWS; } -/**Runs the MultiplyRange Algorithm as a child defining an end bin - @param input :: The input workspace - @param startBin :: The first bin int eh range to multiply - @param endBin :: The last bin in the range to multiply - @param factor :: The multiplication factor - @return A shared pointer to the resulting MatrixWorkspace - */ -MatrixWorkspace_sptr Stitch1D::multiplyRange(MatrixWorkspace_sptr &input, - const int &startBin, - const int &endBin, - const double &factor) { - auto multiplyRange = this->createChildAlgorithm("MultiplyRange"); - multiplyRange->setProperty("InputWorkspace", input); - multiplyRange->setProperty("StartBin", startBin); - multiplyRange->setProperty("EndBin", endBin); - multiplyRange->setProperty("Factor", factor); - g_log.information("MultiplyRange StartBin: " + std::to_string(startBin)); - g_log.information("MultiplyRange EndBin: " + std::to_string(endBin)); - g_log.information("MultiplyRange Factor: " + - boost::lexical_cast<std::string>(factor)); - multiplyRange->execute(); - MatrixWorkspace_sptr outWS = multiplyRange->getProperty("OutputWorkspace"); - return outWS; -} - -/**Runs the MultiplyRange Algorithm as a child - @param input :: The input workspace - @param startBin :: The first bin int eh range to multiply - @param factor :: The multiplication factor - @return A shared pointer to the resulting MatrixWorkspace - */ -MatrixWorkspace_sptr Stitch1D::multiplyRange(MatrixWorkspace_sptr &input, - const int &startBin, - const double &factor) { - auto multiplyRange = this->createChildAlgorithm("MultiplyRange"); - multiplyRange->setProperty("InputWorkspace", input); - multiplyRange->setProperty("StartBin", startBin); - multiplyRange->setProperty("Factor", factor); - g_log.information("MultiplyRange StartBin: " + std::to_string(startBin)); - g_log.information("MultiplyRange Factor: " + - boost::lexical_cast<std::string>(factor)); - multiplyRange->execute(); - MatrixWorkspace_sptr outWS = multiplyRange->getProperty("OutputWorkspace"); - return outWS; -} - /**Runs the WeightedMean Algorithm as a child @param inOne :: The first input workspace @param inTwo :: The second input workspace