Skip to content

Commit

Permalink
Tried to resolve a potential conflict in header. Refs #7001.
Browse files Browse the repository at this point in the history
  • Loading branch information
wdzhou committed Jun 18, 2013
1 parent fad6486 commit 5f4eeed
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Code/Mantid/Framework/Algorithms/src/GeneratePeaks.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*WIKI*
/*WIKI*
Generate a workspace by summing over the peak functions.
The peaks' parameters are given in a [[TableWorkspace]].
Generate a workspace by summing over the peak functions.
The peaks' parameters are given in a [[TableWorkspace]].
==== Peak Parameters ====
Peak parameters must have the following parameters, which are case sensitive in input [[TableWorkspace]]
Expand All @@ -15,13 +15,15 @@ Peak parameters must have the following parameters, which are case sensitive in
7. A2
8. chi2
=======
==== Output ====
Output will include
1. pure peak
2. pure background (with specified range of FWHM (int))
3. peak + background
[[Category:Algorithms]]
{{AlgorithmLinks|GeneratePeaks}}
Expand Down

0 comments on commit 5f4eeed

Please sign in to comment.