From fc2996fba9787ea0bb41d55de216604d81317954 Mon Sep 17 00:00:00 2001
From: Vickie Lynch <lynchve@ornl.gov>
Date: Wed, 3 Oct 2018 10:49:57 -0400
Subject: [PATCH] Refs #23697 clang-format and release note
---
Framework/Crystal/src/SaveIsawPeaks.cpp | 3 ++-
docs/source/release/v3.14.0/diffraction.rst | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Framework/Crystal/src/SaveIsawPeaks.cpp b/Framework/Crystal/src/SaveIsawPeaks.cpp
index ebccb80a5f2..3462324873e 100644
--- a/Framework/Crystal/src/SaveIsawPeaks.cpp
+++ b/Framework/Crystal/src/SaveIsawPeaks.cpp
@@ -267,7 +267,8 @@ void SaveIsawPeaks::exec() {
runMap_t::iterator runMap_it;
for (runMap_it = runMap.begin(); runMap_it != runMap.end(); ++runMap_it) {
// Start of a new run
- if (maxPeakNumb > 0) appendPeakNumb += maxPeakNumb + 1;
+ if (maxPeakNumb > 0)
+ appendPeakNumb += maxPeakNumb + 1;
int run = runMap_it->first;
bankMap_t &bankMap = runMap_it->second;
diff --git a/docs/source/release/v3.14.0/diffraction.rst b/docs/source/release/v3.14.0/diffraction.rst
index 2fcddad7d3a..a014567f662 100644
--- a/docs/source/release/v3.14.0/diffraction.rst
+++ b/docs/source/release/v3.14.0/diffraction.rst
@@ -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
------------------
--
GitLab