From 0464a00992d8153b31c8858d12837f83746c0972 Mon Sep 17 00:00:00 2001
From: Vickie Lynch <lynchve@ornl.gov>
Date: Thu, 13 Dec 2018 10:24:42 -0500
Subject: [PATCH] Refs #24323 allow more extensions
---
Framework/DataHandling/src/LoadIsawDetCal.cpp | 2 +-
docs/source/release/v3.14.0/diffraction.rst | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Framework/DataHandling/src/LoadIsawDetCal.cpp b/Framework/DataHandling/src/LoadIsawDetCal.cpp
index 70fc5025f7b..d50874f0592 100644
--- a/Framework/DataHandling/src/LoadIsawDetCal.cpp
+++ b/Framework/DataHandling/src/LoadIsawDetCal.cpp
@@ -50,7 +50,7 @@ void LoadIsawDetCal::init() {
boost::make_shared<InstrumentValidator>()),
"The workspace containing the geometry to be calibrated.");
- const auto exts = std::vector<std::string>({".DetCal"});
+ const auto exts = std::vector<std::string>({".DetCal", ".detcal", ".peaks", ".integrate"});
declareProperty(
Kernel::make_unique<API::MultipleFileProperty>("Filename", exts),
"The input filename of the ISAW DetCal file (Two files "
diff --git a/docs/source/release/v3.14.0/diffraction.rst b/docs/source/release/v3.14.0/diffraction.rst
index b26d90a4528..fc177a16f4c 100644
--- a/docs/source/release/v3.14.0/diffraction.rst
+++ b/docs/source/release/v3.14.0/diffraction.rst
@@ -48,6 +48,7 @@ Bugfixes
- :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.
+- :ref:`LoadIsawPeaks <algm-LoadIsawPeaks>` now loads the calibration from the peaks file correctly.
Powder Diffraction
------------------
--
GitLab