Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/Create_Monte_Carlo_Ws' into Crea…
Browse files Browse the repository at this point in the history
…te_Monte_Carlo_Ws

# Conflicts:
#	Framework/Algorithms/src/CreateMonteCarloWorkspace.cpp
#	Framework/Algorithms/test/CreateMonteCarloWorkspaceTest.h
#	docs/source/algorithms/CreateMonteCarloWorkspace-v1.rst
  • Loading branch information
Despiix committed Jan 16, 2025
2 parents f30f378 + e9f1338 commit 5ef163a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Framework/Algorithms/src/CreatePeaksWorkspace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void CreatePeaksWorkspace::init() {
declareProperty("NumberOfPeaks", 1, "Number of dummy peaks to initially create.");
declareProperty(std::make_unique<WorkspaceProperty<IPeaksWorkspace>>("OutputWorkspace", "", Direction::Output),
"An output workspace.");
// explicit control of output peak workspace tyep
// explicit control of output peak workspace type
// Full: standar peak workspace
// Lean: LeanElasticPeakWorkspace
const std::vector<std::string> peakworkspaceTypes{"Peak", "LeanElasticPeak"};
Expand Down
Binary file added images/New.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5ef163a

Please sign in to comment.