Skip to content
Snippets Groups Projects
Commit 9aa23e4d authored by Elliot Oram's avatar Elliot Oram
Browse files

Added container run number in Indirect corrections

Refs #13915
parent 07fadfc3
No related branches found
No related tags found
No related merge requests found
...@@ -175,9 +175,18 @@ void ApplyPaalmanPings::run() { ...@@ -175,9 +175,18 @@ void ApplyPaalmanPings::run() {
correctionType = "cyl"; correctionType = "cyl";
break; break;
} }
const QString outputWsName = QString outputWsName =
sampleWsName.left(nameCutIndex) + +"_" + correctionType + "_Corrected"; sampleWsName.left(nameCutIndex) + +"_" + correctionType + "_Corrected";
if (useCan) {
auto containerWsName = m_uiForm.dsContainer->getCurrentDataName();
int cutIndex = containerWsName.indexOf("_");
if (cutIndex == -1) {
cutIndex = containerWsName.length();
}
outputWsName += "_Subtract_" + containerWsName.left(cutIndex);
}
applyCorrAlg->setProperty("OutputWorkspace", outputWsName.toStdString()); applyCorrAlg->setProperty("OutputWorkspace", outputWsName.toStdString());
// Add corrections algorithm to queue // Add corrections algorithm to queue
......
...@@ -122,8 +122,17 @@ void CalculatePaalmanPings::run() { ...@@ -122,8 +122,17 @@ void CalculatePaalmanPings::run() {
break; break;
} }
const QString outputWsName = QString outputWsName =
sampleWsName.left(nameCutIndex) + "_" + correctionType + "_abs"; sampleWsName.left(nameCutIndex) + "_" + correctionType + "_abs";
if (useCan) {
auto containerWsName = m_uiForm.dsContainer->getCurrentDataName();
int cutIndex = containerWsName.indexOf("_");
if (cutIndex == -1) {
cutIndex = containerWsName.length();
}
outputWsName += "_Subtract_" + containerWsName.left(cutIndex);
}
absCorAlgo->setProperty("OutputWorkspace", outputWsName.toStdString()); absCorAlgo->setProperty("OutputWorkspace", outputWsName.toStdString());
// Add corrections algorithm to queue // Add corrections algorithm to queue
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment