From 2791e1111c46a037abd76f075c49cb35b7e0f903 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Sat, 6 Feb 2016 19:00:52 +0000
Subject: [PATCH] fix produce outputs,re #15180
---
.../PythonInterface/plugins/algorithms/EnggCalibrate.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py b/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py
index efd9b104602..f6b3d7fc9a0 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py
@@ -128,7 +128,7 @@ class EnggCalibrate(PythonAlgorithm):
prog.report('Fitting parameters for the focused run')
difc, zero, fitted_peaks = self._fit_params(focussed_ws, expectedPeaksD)
- self._produce_outputs(difc, zero)
+ self._produce_outputs(difc, zero, fitted_peaks)
def _fit_params(self, focused_ws, expected_peaks_d):
"""
@@ -195,18 +195,20 @@ class EnggCalibrate(PythonAlgorithm):
return alg.getProperty('OutputWorkspace').value
- def _produce_outputs(self, difc, zero):
+ def _produce_outputs(self, difc, zero, fitted_peaks):
"""
Just fills in the output properties as requested
@param difc :: the difc GSAS parameter as fitted here
@param zero :: the zero GSAS parameter as fitted here
+ @param fitted_peaks :: table workspace with peak parameters (one peak per row)
"""
import EnggUtils
self.setProperty('Difc', difc)
self.setProperty('Zero', zero)
+ self.setProperty('FittedPeaks', fitted_peaks)
# make output table if requested
tblName = self.getPropertyValue("OutputParametersTableName")
--
GitLab