Merge pull request #16640 from mantidproject/16007_Ungroup_Elwin_output

Indirect Data Analysis - Ungroup Elwin output option

MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Elwin.h

@@ -30,6 +30,7 @@ private slots:
   void minChanged(double val);
   void maxChanged(double val);
   void updateRS(QtProperty *prop, double val);
+  void unGroupInput(bool error);
 
 private:
   void addSaveAlgorithm(QString workspaceName, QString filename = "");

MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Elwin.ui

@@ -45,6 +45,16 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="ckGroupInput">
+         <property name="text">
+           <string>Group Input</string>
+         </property>
+         <property name="checked">
+           <bool>true</bool>
+         </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

MantidQt/CustomInterfaces/src/Indirect/Elwin.cpp

@@ -201,12 +201,31 @@ void Elwin::run() {
       addSaveAlgorithm(eltWorkspace);
   }
 
+  connect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this,
+          SLOT(unGroupInput(bool)));
   m_batchAlgoRunner->executeBatchAsync();
 
   // Set the result workspace for Python script export
   m_pythonExportWsName = qSquaredWorkspace.toStdString();
 }
 
+/**
+ * Ungroups the output after the execution of the algorithm
+ */
+void Elwin::unGroupInput(bool error) {
+  disconnect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this,
+             SLOT(unGroupInput(bool)));
+  if (error)
+    return;
+  if (!m_uiForm.ckGroupInput->isChecked()) {
+    IAlgorithm_sptr ungroupAlg =
+        AlgorithmManager::Instance().create("UnGroupWorkspace");
+    ungroupAlg->initialize();
+    ungroupAlg->setProperty("InputWorkspace", "IDA_Elwin_Input");
+    ungroupAlg->execute();
+  }
+}
+
 /**
  * Configures and adds a SaveNexus algorithm to the batch runner.
  *
@@ -385,14 +404,8 @@ void Elwin::plotInput() {
 
   try {
     QPair<double, double> range = m_uiForm.ppPlot->getCurveRange("Sample");
-    // Set maximum range of Integration
     m_uiForm.ppPlot->getRangeSelector("ElwinIntegrationRange")
         ->setRange(range.first, range.second);
-    // Set initial values
-    m_uiForm.ppPlot->getRangeSelector("ElwinIntegrationRange")
-        ->setMinimum(range.first);
-    m_uiForm.ppPlot->getRangeSelector("ElwinIntegrationRange")
-        ->setMaximum(range.second);
   } catch (std::invalid_argument &exc) {
     showMessageBox(exc.what());
   }

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

@@ -16,6 +16,11 @@ Algorithms
 Data Analysis
 #############
 
+Elwin
+~~~~~
+
+- Additional option to ungroup Elwin output
+
 Jump Fit
 ~~~~~~~~