Merge pull request #22025 from mantidproject/22024_IndirectCorrectionsNaming

Indirect - Absorption Corrections - Unify naming convention in Calculate Paalman Pings and Calculate Monte Carlo Absorption

docs/source/release/v3.12.0/indirect_inelastic.rst

@@ -112,6 +112,7 @@ Improved
 Bugfixes
 ########
 - 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

qt/scientific_interfaces/Indirect/AbsorptionCorrections.cpp

@@ -92,7 +92,7 @@ void AbsorptionCorrections::run() {
     monteCarloAbsCor->setProperty("ContainerDensity",
                                   m_uiForm.spCanDensity->value());
 
-    QString canChemicalFormula = m_uiForm.leCanChemicalFormula->text();
+    const auto canChemicalFormula = m_uiForm.leCanChemicalFormula->text();
     monteCarloAbsCor->setProperty("ContainerChemicalFormula",
                                   canChemicalFormula.toStdString());
 
@@ -104,9 +104,8 @@ void AbsorptionCorrections::run() {
   if (nameCutIndex == -1)
     nameCutIndex = sampleWsName.length();
 
-  QString outputBaseName = sampleWsName.left(nameCutIndex);
-
-  QString outputWsName = outputBaseName + "_" + sampleShape + "_Corrections";
+  const auto outputWsName =
+      sampleWsName.left(nameCutIndex) + "_" + sampleShape + "_MC_Corrections";
 
   monteCarloAbsCor->setProperty("CorrectionsWorkspace",
                                 outputWsName.toStdString());

qt/scientific_interfaces/Indirect/ApplyAbsorptionCorrections.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>704</width>
-    <height>591</height>
+    <width>752</width>
+    <height>744</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -76,13 +76,12 @@
         </property>
         <property name="workspaceSuffixes" stdset="0">
          <stringlist>
-          <string>_flt_abs</string>
           <string>_Corrections</string>
          </stringlist>
         </property>
         <property name="fileBrowserSuffixes" stdset="0">
          <stringlist>
-          <string>_flt_abs.nxs</string>
+          <string>_Corrections.nxs</string>
          </stringlist>
         </property>
         <property name="showLoad" stdset="0">
@@ -264,9 +263,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="MantidQt::MantidWidgets::PreviewPlot" name="ppPreview" native="true">
-        <zorder>gbOptions</zorder>
-       </widget>
+       <widget class="MantidQt::MantidWidgets::PreviewPlot" name="ppPreview" native="true"/>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">

qt/scientific_interfaces/Indirect/CalculatePaalmanPings.cpp

@@ -149,21 +149,8 @@ void CalculatePaalmanPings::run() {
   if (nameCutIndex == -1)
     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 =
-      sampleWsName.left(nameCutIndex) + "_" + correctionType + "_abs";
+      sampleWsName.left(nameCutIndex) + "_" + sampleShape + "_PP_Corrections";
 
   absCorAlgo->setProperty("OutputWorkspace", outputWsName.toStdString());