Skip to content
Snippets Groups Projects
Unverified Commit 8dc530a4 authored by Martyn Gigg's avatar Martyn Gigg Committed by GitHub
Browse files

Merge pull request #22025 from mantidproject/22024_IndirectCorrectionsNaming

Indirect - Absorption Corrections - Unify naming convention in Calculate Paalman Pings and Calculate Monte Carlo Absorption
parents d5206bff eb113744
No related merge requests found
...@@ -112,6 +112,7 @@ Improved ...@@ -112,6 +112,7 @@ Improved
Bugfixes Bugfixes
######## ########
- In the Calculate Paalman Pings tab of the Indirect Correction interface the container back thickness is now set correctly. - In the Calculate Paalman Pings tab of the Indirect Correction interface the container back thickness is now set correctly.
- Fixed the inconsistent naming styles of the Calculate Paalman Pings and Calculate Monte Carlo Absorption interfaces.
Abins Abins
......
...@@ -92,7 +92,7 @@ void AbsorptionCorrections::run() { ...@@ -92,7 +92,7 @@ void AbsorptionCorrections::run() {
monteCarloAbsCor->setProperty("ContainerDensity", monteCarloAbsCor->setProperty("ContainerDensity",
m_uiForm.spCanDensity->value()); m_uiForm.spCanDensity->value());
QString canChemicalFormula = m_uiForm.leCanChemicalFormula->text(); const auto canChemicalFormula = m_uiForm.leCanChemicalFormula->text();
monteCarloAbsCor->setProperty("ContainerChemicalFormula", monteCarloAbsCor->setProperty("ContainerChemicalFormula",
canChemicalFormula.toStdString()); canChemicalFormula.toStdString());
...@@ -104,9 +104,8 @@ void AbsorptionCorrections::run() { ...@@ -104,9 +104,8 @@ void AbsorptionCorrections::run() {
if (nameCutIndex == -1) if (nameCutIndex == -1)
nameCutIndex = sampleWsName.length(); nameCutIndex = sampleWsName.length();
QString outputBaseName = sampleWsName.left(nameCutIndex); const auto outputWsName =
sampleWsName.left(nameCutIndex) + "_" + sampleShape + "_MC_Corrections";
QString outputWsName = outputBaseName + "_" + sampleShape + "_Corrections";
monteCarloAbsCor->setProperty("CorrectionsWorkspace", monteCarloAbsCor->setProperty("CorrectionsWorkspace",
outputWsName.toStdString()); outputWsName.toStdString());
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>704</width> <width>752</width>
<height>591</height> <height>744</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -76,13 +76,12 @@ ...@@ -76,13 +76,12 @@
</property> </property>
<property name="workspaceSuffixes" stdset="0"> <property name="workspaceSuffixes" stdset="0">
<stringlist> <stringlist>
<string>_flt_abs</string>
<string>_Corrections</string> <string>_Corrections</string>
</stringlist> </stringlist>
</property> </property>
<property name="fileBrowserSuffixes" stdset="0"> <property name="fileBrowserSuffixes" stdset="0">
<stringlist> <stringlist>
<string>_flt_abs.nxs</string> <string>_Corrections.nxs</string>
</stringlist> </stringlist>
</property> </property>
<property name="showLoad" stdset="0"> <property name="showLoad" stdset="0">
...@@ -264,9 +263,7 @@ ...@@ -264,9 +263,7 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="MantidQt::MantidWidgets::PreviewPlot" name="ppPreview" native="true"> <widget class="MantidQt::MantidWidgets::PreviewPlot" name="ppPreview" native="true"/>
<zorder>gbOptions</zorder>
</widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
......
...@@ -149,21 +149,8 @@ void CalculatePaalmanPings::run() { ...@@ -149,21 +149,8 @@ void CalculatePaalmanPings::run() {
if (nameCutIndex == -1) if (nameCutIndex == -1)
nameCutIndex = sampleWsName.length(); nameCutIndex = sampleWsName.length();
QString correctionType;
switch (m_uiForm.cbSampleShape->currentIndex()) {
case 0:
correctionType = "flt";
break;
case 1:
correctionType = "cyl";
break;
case 2:
correctionType = "ann";
break;
}
const auto outputWsName = const auto outputWsName =
sampleWsName.left(nameCutIndex) + "_" + correctionType + "_abs"; sampleWsName.left(nameCutIndex) + "_" + sampleShape + "_PP_Corrections";
absCorAlgo->setProperty("OutputWorkspace", outputWsName.toStdString()); absCorAlgo->setProperty("OutputWorkspace", outputWsName.toStdString());
......
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