diff --git a/Framework/Algorithms/src/CreatePeaksWorkspace.cpp b/Framework/Algorithms/src/CreatePeaksWorkspace.cpp index a6e3b19cd0c4ac5dc12ff99c7359270edfb8eddf..fd7683648780dc87654d894bf17313c30adec003 100644 --- a/Framework/Algorithms/src/CreatePeaksWorkspace.cpp +++ b/Framework/Algorithms/src/CreatePeaksWorkspace.cpp @@ -40,9 +40,9 @@ void CreatePeaksWorkspace::init() { // explicit control of output peak workspace tyep // Full: standar peak workspace // Lean: LeanElasticPeakWorkspace - const std::vector<std::string> peakworkspaceTypes{"Full", "Lean"}; + const std::vector<std::string> peakworkspaceTypes{"Peak", "LeanElasticPeak"}; declareProperty( - "OutputType", "Full", + "OutputType", "Peak", std::make_shared<StringListValidator>(peakworkspaceTypes), "Output peak workspace type, default to full peak workspace."); } @@ -62,7 +62,7 @@ void CreatePeaksWorkspace::exec() { IPeaksWorkspace_sptr out; // By default, we generate a PeakWorkspace unless user explicitly // requires a LeanElasticPeakWorkspace - if (outputType == "Full") { + if (outputType == "Peak") { out = std::make_shared<PeaksWorkspace>(); setProperty("OutputWorkspace", out); @@ -93,7 +93,7 @@ void CreatePeaksWorkspace::exec() { progress.report(); } } - } else if (outputType == "Lean") { + } else if (outputType == "LeanElasticPeak") { // use LeanElasticPeakWorkspace, which means no instrument related info out = std::make_shared<LeanElasticPeaksWorkspace>(); setProperty("OutputWorkspace", out); diff --git a/Framework/Algorithms/test/CreatePeaksWorkspaceTest.h b/Framework/Algorithms/test/CreatePeaksWorkspaceTest.h index b985a1630ce62093ab571460030bad569f6da075..8603a66f27581fbb935a60ac925166a802cd40c5 100644 --- a/Framework/Algorithms/test/CreatePeaksWorkspaceTest.h +++ b/Framework/Algorithms/test/CreatePeaksWorkspaceTest.h @@ -73,7 +73,7 @@ public: TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("OutputWorkspace", outWSName)); TS_ASSERT_THROWS_NOTHING(alg.setProperty("NumberOfPeaks", 13)); - TS_ASSERT_THROWS_NOTHING(alg.setProperty("OutputType", "Lean")); + TS_ASSERT_THROWS_NOTHING(alg.setProperty("OutputType", "LeanElasticPeak")); TS_ASSERT_THROWS_NOTHING(alg.execute();) TS_ASSERT(alg.isExecuted());