From ee6af19b59826cec22a902e7ae91ccf433e14319 Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Mon, 21 Sep 2015 15:30:55 +0100
Subject: [PATCH] Added check for ckTempCorrection is checked in order to use
Temp
Refs #13698
---
.../CustomInterfaces/src/Indirect/ConvFit.cpp | 66 ++++++++++---------
1 file changed, 34 insertions(+), 32 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
index cc17bbdcb9f..cc0c6795627 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
@@ -337,39 +337,41 @@ void ConvFit::algorithmComplete(bool error) {
}
// Handle Temperature logs
- QString temperature = m_uiForm.leTempCorrection->text();
- double temp = 0.0;
- if (temperature.toStdString().compare("") != 0) {
- temp = temperature.toDouble();
- }
+ if (m_uiForm.ckTempCorrection->isChecked()) {
+ QString temperature = m_uiForm.leTempCorrection->text();
+ double temp = 0.0;
+ if (temperature.toStdString().compare("") != 0) {
+ temp = temperature.toDouble();
+ }
- if (temp != 0.0) {
- // Obtain WorkspaceGroup from ADS
- std::string groupName = m_baseName.toStdString() + "_Workspaces";
- WorkspaceGroup_sptr groupWs =
- AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>(groupName);
-
- auto addSample = AlgorithmManager::Instance().create("AddSampleLog");
- addSample->setProperty("Workspace", resultWs);
- addSample->setProperty("LogName", "temperature_value");
- addSample->setProperty("LogText", temperature.toStdString());
- addSample->setProperty("LogType", "Number");
- addSample->execute();
- addSample->setProperty("Workspace", resultWs);
- addSample->setProperty("LogName", "temperature_correction");
- addSample->setProperty("LogText", "true");
- addSample->setProperty("LogType", "String");
- addSample->execute();
- addSample->setProperty("Workspace", groupWs);
- addSample->setProperty("LogName", "temperature_value");
- addSample->setProperty("LogText", temperature.toStdString());
- addSample->setProperty("LogType", "Number");
- addSample->execute();
- addSample->setProperty("Workspace", groupWs);
- addSample->setProperty("LogName", "temperature_correction");
- addSample->setProperty("LogText", "true");
- addSample->setProperty("LogType", "String");
- addSample->execute();
+ if (temp != 0.0) {
+ // Obtain WorkspaceGroup from ADS
+ std::string groupName = m_baseName.toStdString() + "_Workspaces";
+ WorkspaceGroup_sptr groupWs =
+ AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>(groupName);
+
+ auto addSample = AlgorithmManager::Instance().create("AddSampleLog");
+ addSample->setProperty("Workspace", resultWs);
+ addSample->setProperty("LogName", "temperature_value");
+ addSample->setProperty("LogText", temperature.toStdString());
+ addSample->setProperty("LogType", "Number");
+ addSample->execute();
+ addSample->setProperty("Workspace", resultWs);
+ addSample->setProperty("LogName", "temperature_correction");
+ addSample->setProperty("LogText", "true");
+ addSample->setProperty("LogType", "String");
+ addSample->execute();
+ addSample->setProperty("Workspace", groupWs);
+ addSample->setProperty("LogName", "temperature_value");
+ addSample->setProperty("LogText", temperature.toStdString());
+ addSample->setProperty("LogType", "Number");
+ addSample->execute();
+ addSample->setProperty("Workspace", groupWs);
+ addSample->setProperty("LogName", "temperature_correction");
+ addSample->setProperty("LogText", "true");
+ addSample->setProperty("LogType", "String");
+ addSample->execute();
+ }
}
updatePlot();
}
--
GitLab