diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ConvolutionFitSequential.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ConvolutionFitSequential.h index 22858f33571a57157b3905fe49ce6caed43d0916..efdbbf5ee7913659ea0bad1f86f63933ffbc67cc 100644 --- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ConvolutionFitSequential.h +++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ConvolutionFitSequential.h @@ -53,8 +53,7 @@ private: const std::vector<std::string> &); std::vector<double> squareVector(std::vector<double>); std::vector<double> cloneVector(const std::vector<double> &); - void convertInputToElasticQ(API::MatrixWorkspace_sptr &, - const std::string &); + void convertInputToElasticQ(API::MatrixWorkspace_sptr &, const std::string &); void calculateEISF(API::ITableWorkspace_sptr &); std::string convertBackToShort(const std::string &); std::string convertFuncToShort(const std::string &); diff --git a/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp b/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp index dc94ab1ede4acb59e4bc58ec85694f0f5e2fa5cc..e97de95b56dddee558a27632a83eddff8f40a886 100644 --- a/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp +++ b/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp @@ -456,7 +456,7 @@ void ConvolutionFitSequential::convertInputToElasticQ( auto axis = inputWs->getAxis(1); if (axis->isSpectra()) { auto convSpec = createChildAlgorithm("ConvertSpectrumAxis"); - // remains in ADS for use in embedded algorithm call + // Store in ADS to allow use by PlotPeakByLogValue convSpec->setAlwaysStoreInADS(true); convSpec->setProperty("InputWorkSpace", inputWs); convSpec->setProperty("OutputWorkSpace", wsName); @@ -469,7 +469,8 @@ void ConvolutionFitSequential::convertInputToElasticQ( throw std::runtime_error("Input must have axis values of Q"); } auto cloneWs = createChildAlgorithm("CloneWorkspace"); - cloneWs->setAlwaysStoreInADS(true); + // Store in ADS to allow use by PlotPeakByLogValue + cloneWs->setAlwaysStoreInADS(true); cloneWs->setProperty("InputWorkspace", inputWs); cloneWs->setProperty("OutputWorkspace", wsName); cloneWs->executeAsChildAlg(); diff --git a/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h b/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h index 1982e99cc7773698352a132929b66045b8d62c1c..2629f0bc86de8c6acc0a90b89c4d22ca0aba74a6 100644 --- a/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h +++ b/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h @@ -146,7 +146,7 @@ public: alg.setProperty("Minimizer", "Levenberg-Marquardt"); alg.setProperty("MaxIterations", 500); TS_ASSERT_THROWS_NOTHING(alg.execute()); - TS_ASSERT(alg.isExecuted()); + TS_ASSERT(alg.isExecuted()); // Retrieve and analyse parameter table - Param table does not require // further testing as this is tested in the ProcessIndirectFitParameters @@ -197,13 +197,13 @@ public: TS_ASSERT_EQUALS(memberLogs.at(6)->value(), "ReductionWs_"); TS_ASSERT_EQUALS(memberLogs.at(7)->value(), "1"); - AnalysisDataService::Instance().clear(); + AnalysisDataService::Instance().clear(); } void test_exec_with_sqw_file() { auto sqwWs = createGenericWorkspace("SqwWs_", true); - auto resWs = createGenericWorkspace("ResolutionWs_", false); - auto convFitRes = createGenericWorkspace("__ConvFit_Resolution", false); + auto resWs = createGenericWorkspace("ResolutionWs_", false); + auto convFitRes = createGenericWorkspace("__ConvFit_Resolution", false); Mantid::Algorithms::ConvolutionFitSequential alg; TS_ASSERT_THROWS_NOTHING(alg.initialize()); alg.setProperty("InputWorkspace", sqwWs); @@ -223,9 +223,9 @@ public: alg.setProperty("Minimizer", "Levenberg-Marquardt"); alg.setProperty("MaxIterations", 500); TS_ASSERT_THROWS_NOTHING(alg.execute()); - TS_ASSERT(alg.isExecuted()); + TS_ASSERT(alg.isExecuted()); - // Assert that output is in ADS + // Assert that output is in ADS TS_ASSERT_THROWS_NOTHING( AnalysisDataService::Instance().retrieveWS<ITableWorkspace>( "SqwWs_conv_1LFixF_s0_to_0_Parameters")); @@ -238,7 +238,7 @@ public: AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>( "SqwWs_conv_1LFixF_s0_to_0_Workspaces")); - AnalysisDataService::Instance().clear(); + AnalysisDataService::Instance().clear(); } //------------------------ Private Functions--------------------------- @@ -250,7 +250,8 @@ public: const auto yData = boost::assign::list_of(0)(1)(3)(1)(0) .convert_to_container<Mantid::MantidVec>(); - auto createWorkspace = AlgorithmManager::Instance().create("CreateWorkspace"); + auto createWorkspace = + AlgorithmManager::Instance().create("CreateWorkspace"); createWorkspace->initialize(); if (numericAxis) { createWorkspace->setProperty("UnitX", "DeltaE");