Unverified Commit 4e929437 authored by Savici, Andrei T's avatar Savici, Andrei T Committed by GitHub
Browse files

Merge pull request #23705 from mantidproject/23697_peak_numbers_combined

Peak numbers unique when peak workspaces combined
parents 6b118829 0c88a42a
......@@ -267,7 +267,10 @@ void SaveIsawPeaks::exec() {
runMap_t::iterator runMap_it;
for (runMap_it = runMap.begin(); runMap_it != runMap.end(); ++runMap_it) {
// Start of a new run
appendPeakNumb += maxPeakNumb;
if (maxPeakNumb > 0) {
appendPeakNumb += maxPeakNumb + 1;
maxPeakNumb = 0;
}
int run = runMap_it->first;
bankMap_t &bankMap = runMap_it->second;
......
......@@ -41,6 +41,7 @@ Bugfixes
- :ref:`CentroidPeaksMD <algm-CentroidPeaksMD>` now updates peak bin counts.
- :ref:`FindPeaksMD <algm-FindPeaksMD>` now finds peaks correctly with the crystallography convention setting and reduction with crystallography convention is tested with a system test.
- :ref:`SaveIsawPeaks <algm-SaveIsawPeaks>` does not have duplicate peak numbers when saving PeaksWorkspaces with more than one RunNumber.
Powder Diffraction
------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment