diff --git a/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp b/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp index 42270faab779a63de3226cd5b3b3cc4ebd2c2de6..31673e9553664f2238fd0c76a269b296e74d3688 100644 --- a/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp +++ b/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp @@ -175,9 +175,18 @@ void ApplyPaalmanPings::run() { correctionType = "cyl"; break; } - const QString outputWsName = + QString outputWsName = 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()); // Add corrections algorithm to queue diff --git a/MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp b/MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp index 81277fad6d9919ec6d2057026a52be6716bff9c2..49584757883539d7ef1a4332893875067f9017e1 100644 --- a/MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp +++ b/MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp @@ -122,8 +122,17 @@ void CalculatePaalmanPings::run() { break; } - const QString outputWsName = + QString outputWsName = 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()); // Add corrections algorithm to queue