Merge pull request #22005 from mantidproject/21969_IndirectISISCalibration

Indirect - ISIS Calibration - Check if resolution was included in calibration when plotting result

qt/scientific_interfaces/Indirect/ISISCalibration.h

 #ifndef MANTIDQTCUSTOMINTERFACES_ISISCALIBRATION_H_
 #define MANTIDQTCUSTOMINTERFACES_ISISCALIBRATION_H_
 
+#include "../General/UserInputValidator.h"
 #include "IndirectDataReductionTab.h"
-#include "ui_ISISCalibration.h"
 #include "MantidKernel/System.h"
-#include "../General/UserInputValidator.h"
+#include "ui_ISISCalibration.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
@@ -46,6 +46,25 @@ public:
   void run() override;
   bool validate() override;
 
+  std::pair<double, double> peakRange() const;
+  std::pair<double, double> backgroundRange() const;
+  std::pair<double, double> resolutionRange() const;
+
+  QString peakRangeString() const;
+  QString backgroundRangeString() const;
+  QString instrumentDetectorRangeString() const;
+  QString outputWorkspaceName() const;
+  QString resolutionDetectorRangeString() const;
+  QString rebinString() const;
+  QString backgroundString() const;
+
+  void setPeakRange(const double &minimumTof, const double &maximumTof);
+  void setBackgroundRange(const double &minimumTof, const double &maximumTof);
+  void setPeakRangeLimits(const double &peakMin, const double &peakMax);
+  void setBackgroundRangeLimits(const double &backgroundMin,
+                                const double &backgroundMax);
+  void setResolutionSpectraRange(const double &minimum, const double &maximum);
+
 private slots:
   void algorithmComplete(bool error);
   void calPlotRaw();
@@ -68,6 +87,17 @@ private slots:
 
 private:
   void createRESfile(const QString &file);
+  void addRuntimeSmoothing(const QString &workspaceName);
+  void setRangeLimits(MantidWidgets::RangeSelector *rangeSelector,
+                      const double &minimum, const double &maximum,
+                      const QString &minPropertyName,
+                      const QString &maxPropertyName);
+  Mantid::API::IAlgorithm_sptr
+  calibrationAlgorithm(const QString &inputFiles) const;
+  Mantid::API::IAlgorithm_sptr
+  resolutionAlgorithm(const QString &inputFiles) const;
+  Mantid::API::IAlgorithm_sptr
+  energyTransferReductionAlgorithm(const QString &inputFiles) const;
 
   Ui::ISISCalibration m_uiForm;
   QString m_lastCalPlotFilename;
@@ -76,6 +106,6 @@ private:
   QString m_outputResolutionName;
 };
 } // namespace CustomInterfaces
-} // namespace Mantid
+} // namespace MantidQt
 
 #endif // MANTIDQTCUSTOMINTERFACES_ISISCALIBRATION_H_

qt/scientific_interfaces/Indirect/IndirectDataReductionTab.cpp

@@ -84,7 +84,7 @@ IndirectDataReductionTab::loadInstrumentIfNotExist(std::string instrumentName,
  *
  * @return Map of information ID to value
  */
-QMap<QString, QString> IndirectDataReductionTab::getInstrumentDetails() {
+QMap<QString, QString> IndirectDataReductionTab::getInstrumentDetails() const {
   return m_idrUI->getInstrumentDetails();
 }
 
@@ -94,7 +94,7 @@ QMap<QString, QString> IndirectDataReductionTab::getInstrumentDetails() {
  * @return Instrument config widget
  */
 MantidWidgets::IndirectInstrumentConfig *
-IndirectDataReductionTab::getInstrumentConfiguration() {
+IndirectDataReductionTab::getInstrumentConfiguration() const {
   return m_idrUI->m_uiForm.iicInstrumentConfiguration;
 }
 

qt/scientific_interfaces/Indirect/IndirectDataReductionTab.h

@@ -95,12 +95,12 @@ protected:
                            std::string analyser = "",
                            std::string reflection = "");
   /// Function to get details about the instrumet from a given workspace
-  QMap<QString, QString> getInstrumentDetails();
+  QMap<QString, QString> getInstrumentDetails() const;
   std::map<std::string, double>
   getRangesFromInstrument(QString instName = "", QString analyser = "",
                           QString reflection = "");
   /// Get the instrument config widget
-  MantidWidgets::IndirectInstrumentConfig *getInstrumentConfiguration();
+  MantidWidgets::IndirectInstrumentConfig *getInstrumentConfiguration() const;
 
 private slots:
   void tabExecutionComplete(bool error);