diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt index dd7c0b528b97..df981cd0a56b 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt +++ b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt @@ -12,12 +12,9 @@ set ( SRC_FILES src/Indirect/IDATab.cpp src/Indirect/IndirectBayes.cpp src/Indirect/IndirectBayesTab.cpp - src/Indirect/IndirectCalibration.cpp - src/Indirect/IndirectConvertToEnergy.cpp src/Indirect/IndirectDataAnalysis.cpp src/Indirect/IndirectDataReduction.cpp src/Indirect/IndirectDataReductionTab.cpp - src/Indirect/IndirectDiagnostics.cpp src/Indirect/IndirectDiffractionReduction.cpp src/Indirect/IndirectLoadILL.cpp src/Indirect/IndirectMolDyn.cpp @@ -32,6 +29,9 @@ set ( SRC_FILES src/Indirect/IndirectToolsTab.cpp src/Indirect/IndirectTransmission.cpp src/Indirect/IndirectTransmissionCalc.cpp + src/Indirect/ISISCalibration.cpp + src/Indirect/ISISDiagnostics.cpp + src/Indirect/ISISEnergyTransfer.cpp src/Indirect/JumpFit.cpp src/Indirect/MSDFit.cpp src/Indirect/Quasi.cpp @@ -91,12 +91,9 @@ set ( INC_FILES inc/MantidQtCustomInterfaces/Indirect/FuryFit.h inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h - inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h - inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h - inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h @@ -116,6 +113,9 @@ set ( INC_FILES inc/MantidQtCustomInterfaces/Indirect/Quasi.h inc/MantidQtCustomInterfaces/Indirect/ResNorm.h inc/MantidQtCustomInterfaces/Indirect/Stretch.h + inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.h + inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h + inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h inc/MantidQtCustomInterfaces/IReflPresenter.h inc/MantidQtCustomInterfaces/IReflSearcher.h inc/MantidQtCustomInterfaces/MantidEV.h @@ -178,12 +178,9 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h inc/MantidQtCustomInterfaces/Indirect/FuryFit.h inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h - inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h - inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h - inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h @@ -203,6 +200,9 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h inc/MantidQtCustomInterfaces/Indirect/Quasi.h inc/MantidQtCustomInterfaces/Indirect/ResNorm.h inc/MantidQtCustomInterfaces/Indirect/Stretch.h + inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.h + inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h + inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h inc/MantidQtCustomInterfaces/MultiDatasetFit.h inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingPresenter.h inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.h @@ -243,11 +243,8 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/AddWorkspace.ui inc/MantidQtCustomInterfaces/Indirect/Fury.ui inc/MantidQtCustomInterfaces/Indirect/FuryFit.ui inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.ui - inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.ui - inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.ui inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.ui inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.ui - inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.ui inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.ui inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.ui @@ -264,6 +261,9 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/AddWorkspace.ui inc/MantidQtCustomInterfaces/Indirect/Quasi.ui inc/MantidQtCustomInterfaces/Indirect/ResNorm.ui inc/MantidQtCustomInterfaces/Indirect/Stretch.ui + inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.ui + inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.ui + inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.ui inc/MantidQtCustomInterfaces/MultiDatasetFit.ui inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.ui inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.h similarity index 81% rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.h index 295f3e5229b3..e5089329de9b 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h +++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.h @@ -1,8 +1,8 @@ -#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTCALIBRATION_H_ -#define MANTIDQTCUSTOMINTERFACES_INDIRECTCALIBRATION_H_ +#ifndef MANTIDQTCUSTOMINTERFACES_ISISCALIBRATION_H_ +#define MANTIDQTCUSTOMINTERFACES_ISISCALIBRATION_H_ #include "IndirectDataReductionTab.h" -#include "ui_IndirectCalibration.h" +#include "ui_ISISCalibration.h" #include "MantidKernel/System.h" #include "MantidQtCustomInterfaces/UserInputValidator.h" @@ -10,7 +10,8 @@ namespace MantidQt { namespace CustomInterfaces { - /** IndirectCalibration + /** ISISCalibration + Handles vanadium run calibration for ISIS instruments. @author Dan Nixon @date 23/07/2014 @@ -35,13 +36,13 @@ namespace CustomInterfaces File change history is stored at: Code Documentation is available at: */ - class DLLExport IndirectCalibration : public IndirectDataReductionTab + class DLLExport ISISCalibration : public IndirectDataReductionTab { Q_OBJECT public: - IndirectCalibration(IndirectDataReduction * idrUI, QWidget * parent = 0); - virtual ~IndirectCalibration(); + ISISCalibration(IndirectDataReduction * idrUI, QWidget * parent = 0); + virtual ~ISISCalibration(); virtual void setup(); virtual void run(); @@ -64,11 +65,11 @@ namespace CustomInterfaces private: void createRESfile(const QString& file); - Ui::IndirectCalibration m_uiForm; + Ui::ISISCalibration m_uiForm; QString m_lastCalPlotFilename; }; } // namespace CustomInterfaces } // namespace Mantid -#endif //MANTIDQTCUSTOMINTERFACES_INDIRECTCALIBRATION_H_ +#endif //MANTIDQTCUSTOMINTERFACES_ISISCALIBRATION_H_ diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.ui similarity index 98% rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.ui rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.ui index 1c86fc8dab5d..80446b5ab3a4 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.ui +++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.ui @@ -1,7 +1,7 @@ - IndirectCalibration - + ISISCalibration + 0 diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h similarity index 83% rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h index 5020695b6fe4..b487e370ad97 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h +++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h @@ -1,8 +1,8 @@ -#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTDIAGNOSTICS_H_ -#define MANTIDQTCUSTOMINTERFACES_INDIRECTDIAGNOSTICS_H_ +#ifndef MANTIDQTCUSTOMINTERFACES_ISISDIAGNOSTICS_H_ +#define MANTIDQTCUSTOMINTERFACES_ISISDIAGNOSTICS_H_ #include "IndirectDataReductionTab.h" -#include "ui_IndirectDiagnostics.h" +#include "ui_ISISDiagnostics.h" #include "MantidAPI/MatrixWorkspace.h" #include "MantidKernel/System.h" @@ -28,7 +28,8 @@ namespace MantidQt { namespace CustomInterfaces { - /** IndirectDiagnostics + /** ISISDiagnostics + Handles time integration diagnostics for ISIS instruments. @author Dan Nixon @date 23/07/2014 @@ -53,13 +54,13 @@ namespace CustomInterfaces File change history is stored at: Code Documentation is available at: */ - class DLLExport IndirectDiagnostics : public IndirectDataReductionTab + class DLLExport ISISDiagnostics : public IndirectDataReductionTab { Q_OBJECT public: - IndirectDiagnostics(IndirectDataReduction * idrUI, QWidget * parent = 0); - virtual ~IndirectDiagnostics(); + ISISDiagnostics(IndirectDataReduction * idrUI, QWidget * parent = 0); + virtual ~ISISDiagnostics(); virtual void setup(); virtual void run(); @@ -79,11 +80,11 @@ namespace CustomInterfaces void pbRunFinished(); //< Called when the FileFinder has finished finding the files. private: - Ui::IndirectDiagnostics m_uiForm; + Ui::ISISDiagnostics m_uiForm; QString m_lastDiagFilename; }; } // namespace CustomInterfaces } // namespace Mantid -#endif //MANTIDQTCUSTOMINTERFACES_INDIRECTDIAGNOSTICS_H__ +#endif //MANTIDQTCUSTOMINTERFACES_ISISDIAGNOSTICS_H_ diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.ui similarity index 98% rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.ui rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.ui index 86d24761770d..d8aef4679940 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.ui +++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.ui @@ -1,7 +1,7 @@ - IndirectDiagnostics - + ISISDiagnostics + 0 diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h similarity index 81% rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h index 55e065000367..167b3f9c1e28 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h +++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h @@ -1,8 +1,8 @@ -#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTCONVERTTOENERGY_H_ -#define MANTIDQTCUSTOMINTERFACES_INDIRECTCONVERTTOENERGY_H_ +#ifndef MANTIDQTCUSTOMINTERFACES_ISISENERGYTRANSFER_H_ +#define MANTIDQTCUSTOMINTERFACES_ISISENERGYTRANSFER_H_ #include "IndirectDataReductionTab.h" -#include "ui_IndirectConvertToEnergy.h" +#include "ui_ISISEnergyTransfer.h" #include "MantidKernel/System.h" #include "MantidQtCustomInterfaces/Background.h" @@ -10,7 +10,8 @@ namespace MantidQt { namespace CustomInterfaces { - /** IndirectConvertToEnergy + /** ISISEnergyTransfer + Handles an energy transfer reduction for ISIS instruments. @author Dan Nixon @date 23/07/2014 @@ -35,13 +36,13 @@ namespace CustomInterfaces File change history is stored at: Code Documentation is available at: */ - class DLLExport IndirectConvertToEnergy : public IndirectDataReductionTab + class DLLExport ISISEnergyTransfer : public IndirectDataReductionTab { Q_OBJECT public: - IndirectConvertToEnergy(IndirectDataReduction * idrUI, QWidget * parent = 0); - virtual ~IndirectConvertToEnergy(); + ISISEnergyTransfer(IndirectDataReduction * idrUI, QWidget * parent = 0); + virtual ~ISISEnergyTransfer(); virtual void setup(); virtual void run(); @@ -60,7 +61,7 @@ namespace CustomInterfaces void plotRawComplete(bool error); //< Called when the Plot Raw algorithmm chain completes private: - Ui::IndirectConvertToEnergy m_uiForm; + Ui::ISISEnergyTransfer m_uiForm; QString createMapFile(const QString& groupType); ///< create the mapping file with which to group results std::vector getSaveFormats(); ///< get a vector of save formats @@ -69,4 +70,4 @@ namespace CustomInterfaces } // namespace CustomInterfaces } // namespace Mantid -#endif //MANTIDQTCUSTOMINTERFACES_INDIRECTCONVERTTOENERGY_H_ +#endif //MANTIDQTCUSTOMINTERFACES_ISISENERGYTRANSFER_H_ diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.ui similarity index 99% rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.ui rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.ui index c0b72ee847eb..f869cd759eb3 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.ui +++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.ui @@ -1,7 +1,7 @@ - IndirectConvertToEnergy - + ISISEnergyTransfer + 0 diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISCalibration.cpp similarity index 96% rename from Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISCalibration.cpp index 4554eb11e15d..058459d8cc98 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp +++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISCalibration.cpp @@ -1,4 +1,4 @@ -#include "MantidQtCustomInterfaces/Indirect/IndirectCalibration.h" +#include "MantidQtCustomInterfaces/Indirect/ISISCalibration.h" #include "MantidKernel/Logger.h" @@ -8,7 +8,7 @@ using namespace Mantid::API; namespace { - Mantid::Kernel::Logger g_log("IndirectCalibration"); + Mantid::Kernel::Logger g_log("ISISCalibration"); } using namespace Mantid::API; @@ -21,7 +21,7 @@ namespace CustomInterfaces //---------------------------------------------------------------------------------------------- /** Constructor */ - IndirectCalibration::IndirectCalibration(IndirectDataReduction * idrUI, QWidget * parent) : + ISISCalibration::ISISCalibration(IndirectDataReduction * idrUI, QWidget * parent) : IndirectDataReductionTab(idrUI, parent), m_lastCalPlotFilename("") { @@ -143,15 +143,15 @@ namespace CustomInterfaces //---------------------------------------------------------------------------------------------- /** Destructor */ - IndirectCalibration::~IndirectCalibration() + ISISCalibration::~ISISCalibration() { } - void IndirectCalibration::setup() + void ISISCalibration::setup() { } - void IndirectCalibration::run() + void ISISCalibration::run() { // Get properties QString firstFile = m_uiForm.leRunNo->getFirstFilename(); @@ -281,7 +281,7 @@ namespace CustomInterfaces m_batchAlgoRunner->executeBatchAsync(); } - void IndirectCalibration::algorithmComplete(bool error) + void ISISCalibration::algorithmComplete(bool error) { if(error) return; @@ -294,7 +294,7 @@ namespace CustomInterfaces } } - bool IndirectCalibration::validate() + bool ISISCalibration::validate() { MantidQt::CustomInterfaces::UserInputValidator uiv; @@ -330,7 +330,7 @@ namespace CustomInterfaces /** * Sets default spectra, peak and background ranges. */ - void IndirectCalibration::setDefaultInstDetails() + void ISISCalibration::setDefaultInstDetails() { // Get spectra, peak and background details std::map instDetails = getInstrumentDetails(); @@ -355,7 +355,7 @@ namespace CustomInterfaces /** * Replots the raw data mini plot and the energy mini plot */ - void IndirectCalibration::calPlotRaw() + void ISISCalibration::calPlotRaw() { setDefaultInstDetails(); @@ -408,7 +408,7 @@ namespace CustomInterfaces /** * Replots the energy mini plot */ - void IndirectCalibration::calPlotEnergy() + void ISISCalibration::calPlotEnergy() { if ( ! m_uiForm.leRunNo->isValid() ) { @@ -473,7 +473,7 @@ namespace CustomInterfaces * * @param ws :: Mantid workspace containing the loaded instument */ - void IndirectCalibration::calSetDefaultResolution(MatrixWorkspace_const_sptr ws) + void ISISCalibration::calSetDefaultResolution(MatrixWorkspace_const_sptr ws) { auto inst = ws->getInstrument(); auto analyser = inst->getStringParameter("analyser"); @@ -509,7 +509,7 @@ namespace CustomInterfaces * * @param val :: New minumum value */ - void IndirectCalibration::calMinChanged(double val) + void ISISCalibration::calMinChanged(double val) { MantidWidgets::RangeSelector* from = qobject_cast(sender()); if ( from == m_rangeSelectors["CalPeak"] ) @@ -536,7 +536,7 @@ namespace CustomInterfaces * * @param val :: New maxumum value */ - void IndirectCalibration::calMaxChanged(double val) + void ISISCalibration::calMaxChanged(double val) { MantidWidgets::RangeSelector* from = qobject_cast(sender()); if ( from == m_rangeSelectors["CalPeak"] ) @@ -563,7 +563,7 @@ namespace CustomInterfaces * @param prop :: The property to update * @param val :: New value for property */ - void IndirectCalibration::calUpdateRS(QtProperty* prop, double val) + void ISISCalibration::calUpdateRS(QtProperty* prop, double val) { if ( prop == m_properties["CalPeakMin"] ) m_rangeSelectors["CalPeak"]->setMinimum(val); else if ( prop == m_properties["CalPeakMax"] ) m_rangeSelectors["CalPeak"]->setMaximum(val); @@ -580,7 +580,7 @@ namespace CustomInterfaces * * @param state :: whether checkbox is checked or unchecked */ - void IndirectCalibration::resCheck(bool state) + void ISISCalibration::resCheck(bool state) { m_rangeSelectors["ResPeak"]->setVisible(state); m_rangeSelectors["ResBackground"]->setVisible(state); @@ -593,7 +593,7 @@ namespace CustomInterfaces /** * Called when a user starts to type / edit the runs to load. */ - void IndirectCalibration::pbRunEditing() + void ISISCalibration::pbRunEditing() { emit updateRunButton(false, "Editing...", "Run numbers are curently being edited."); } @@ -601,7 +601,7 @@ namespace CustomInterfaces /** * Called when the FileFinder starts finding the files. */ - void IndirectCalibration::pbRunFinding() + void ISISCalibration::pbRunFinding() { emit updateRunButton(false, "Finding files...", "Searchig for data files for the run numbers entered..."); m_uiForm.leRunNo->setEnabled(false); @@ -610,7 +610,7 @@ namespace CustomInterfaces /** * Called when the FileFinder has finished finding the files. */ - void IndirectCalibration::pbRunFinished() + void ISISCalibration::pbRunFinished() { if(!m_uiForm.leRunNo->isValid()) { diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiagnostics.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISDiagnostics.cpp similarity index 94% rename from Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiagnostics.cpp rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISDiagnostics.cpp index c773f40c4c8b..1f8e15596b01 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiagnostics.cpp +++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISDiagnostics.cpp @@ -1,4 +1,4 @@ -#include "MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h" +#include "MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h" #include "MantidAPI/MatrixWorkspace.h" #include "MantidKernel/Logger.h" @@ -10,7 +10,7 @@ using namespace Mantid::API; namespace { - Mantid::Kernel::Logger g_log("IndirectDiagnostics"); + Mantid::Kernel::Logger g_log("ISISDiagnostics"); } namespace MantidQt @@ -20,7 +20,7 @@ namespace CustomInterfaces //---------------------------------------------------------------------------------------------- /** Constructor */ - IndirectDiagnostics::IndirectDiagnostics(IndirectDataReduction * idrUI, QWidget * parent) : + ISISDiagnostics::ISISDiagnostics(IndirectDataReduction * idrUI, QWidget * parent) : IndirectDataReductionTab(idrUI, parent), m_lastDiagFilename("") { @@ -111,15 +111,15 @@ namespace CustomInterfaces //---------------------------------------------------------------------------------------------- /** Destructor */ - IndirectDiagnostics::~IndirectDiagnostics() + ISISDiagnostics::~ISISDiagnostics() { } - void IndirectDiagnostics::setup() + void ISISDiagnostics::setup() { } - void IndirectDiagnostics::run() + void ISISDiagnostics::run() { QString suffix = "_" + getInstrumentConfiguration()->getAnalyserName() + getInstrumentConfiguration()->getReflectionName() + "_slice"; @@ -161,7 +161,7 @@ namespace CustomInterfaces runAlgorithm(sliceAlg); } - bool IndirectDiagnostics::validate() + bool ISISDiagnostics::validate() { UserInputValidator uiv; @@ -200,7 +200,7 @@ namespace CustomInterfaces /** * Sets default spectra, peak and background ranges. */ - void IndirectDiagnostics::setDefaultInstDetails() + void ISISDiagnostics::setDefaultInstDetails() { //Get spectra, peak and background details std::map instDetails = getInstrumentDetails(); @@ -225,7 +225,7 @@ namespace CustomInterfaces /** * Redraw the raw input plot */ - void IndirectDiagnostics::slicePlotRaw() + void ISISDiagnostics::slicePlotRaw() { QString filename = m_uiForm.dsInputFiles->getFirstFilename(); @@ -284,7 +284,7 @@ namespace CustomInterfaces * * @param state :: True to show the second range selectors, false to hide */ - void IndirectDiagnostics::sliceTwoRanges(QtProperty*, bool state) + void ISISDiagnostics::sliceTwoRanges(QtProperty*, bool state) { m_rangeSelectors["SliceBackground"]->setVisible(state); } @@ -294,12 +294,12 @@ namespace CustomInterfaces * * @param state :: True to enable calibration file, false otherwise */ - void IndirectDiagnostics::sliceCalib(bool state) + void ISISDiagnostics::sliceCalib(bool state) { m_uiForm.dsCalibration->setEnabled(state); } - void IndirectDiagnostics::rangeSelectorDropped(double min, double max) + void ISISDiagnostics::rangeSelectorDropped(double min, double max) { MantidWidgets::RangeSelector* from = qobject_cast(sender()); @@ -321,7 +321,7 @@ namespace CustomInterfaces * @param prop :: Pointer to the QtProperty * @param val :: New value of the range selector */ - void IndirectDiagnostics::sliceUpdateRS(QtProperty* prop, double val) + void ISISDiagnostics::sliceUpdateRS(QtProperty* prop, double val) { if(prop == m_properties["PeakStart"]) m_rangeSelectors["SlicePeak"]->setMinimum(val); else if(prop == m_properties["PeakEnd"]) m_rangeSelectors["SlicePeak"]->setMaximum(val); @@ -332,7 +332,7 @@ namespace CustomInterfaces /** * Runs the slice algorithm with preview properties. */ - void IndirectDiagnostics::updatePreviewPlot() + void ISISDiagnostics::updatePreviewPlot() { QString suffix = getInstrumentConfiguration()->getAnalyserName() + getInstrumentConfiguration()->getReflectionName() + "_slice"; @@ -381,7 +381,7 @@ namespace CustomInterfaces * * @param error True if the algorithm was stopped due to error, false otherwise */ - void IndirectDiagnostics::sliceAlgDone(bool error) + void ISISDiagnostics::sliceAlgDone(bool error) { if(error) return; @@ -420,7 +420,7 @@ namespace CustomInterfaces /** * Called when a user starts to type / edit the runs to load. */ - void IndirectDiagnostics::pbRunEditing() + void ISISDiagnostics::pbRunEditing() { emit updateRunButton(false, "Editing...", "Run numbers are curently being edited."); } @@ -428,7 +428,7 @@ namespace CustomInterfaces /** * Called when the FileFinder starts finding the files. */ - void IndirectDiagnostics::pbRunFinding() + void ISISDiagnostics::pbRunFinding() { emit updateRunButton(false, "Finding files...", "Searchig for data files for the run numbers entered..."); m_uiForm.dsInputFiles->setEnabled(false); @@ -437,7 +437,7 @@ namespace CustomInterfaces /** * Called when the FileFinder has finished finding the files. */ - void IndirectDiagnostics::pbRunFinished() + void ISISDiagnostics::pbRunFinished() { if(!m_uiForm.dsInputFiles->isValid()) { diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectConvertToEnergy.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp similarity index 94% rename from Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectConvertToEnergy.cpp rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp index 90fdee795845..d277978e14fd 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectConvertToEnergy.cpp +++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp @@ -1,4 +1,4 @@ -#include "MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h" +#include "MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h" #include "MantidQtCustomInterfaces/Background.h" #include "MantidQtCustomInterfaces/UserInputValidator.h" @@ -15,7 +15,7 @@ namespace CustomInterfaces //---------------------------------------------------------------------------------------------- /** Constructor */ - IndirectConvertToEnergy::IndirectConvertToEnergy(IndirectDataReduction * idrUI, QWidget * parent) : + ISISEnergyTransfer::ISISEnergyTransfer(IndirectDataReduction * idrUI, QWidget * parent) : IndirectDataReductionTab(idrUI, parent) { m_uiForm.setupUi(parent); @@ -50,17 +50,17 @@ namespace CustomInterfaces //---------------------------------------------------------------------------------------------- /** Destructor */ - IndirectConvertToEnergy::~IndirectConvertToEnergy() + ISISEnergyTransfer::~ISISEnergyTransfer() { } - void IndirectConvertToEnergy::setup() + void ISISEnergyTransfer::setup() { } - bool IndirectConvertToEnergy::validate() + bool ISISEnergyTransfer::validate() { UserInputValidator uiv; @@ -103,7 +103,7 @@ namespace CustomInterfaces } - void IndirectConvertToEnergy::run() + void ISISEnergyTransfer::run() { using MantidQt::API::BatchAlgorithmRunner; @@ -196,7 +196,7 @@ namespace CustomInterfaces * * @param error True if the algorithm was stopped due to error, false otherwise */ - void IndirectConvertToEnergy::algorithmComplete(bool error) + void ISISEnergyTransfer::algorithmComplete(bool error) { disconnect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this, SLOT(algorithmComplete(bool))); @@ -219,7 +219,7 @@ namespace CustomInterfaces /** * Called when the instrument has changed, used to update default values. */ - void IndirectConvertToEnergy::setInstrumentDefault() + void ISISEnergyTransfer::setInstrumentDefault() { std::map instDetails = getInstrumentDetails(); @@ -298,7 +298,7 @@ namespace CustomInterfaces * This function runs when the user makes a selection on the cbGroupingOptions QComboBox. * @param groupType :: Value of selection made by user. */ - void IndirectConvertToEnergy::mappingOptionSelected(const QString& groupType) + void ISISEnergyTransfer::mappingOptionSelected(const QString& groupType) { if ( groupType == "File" ) { @@ -319,7 +319,7 @@ namespace CustomInterfaces * @param groupType :: Type of grouping (All, Group, Indiviual) * @return path to mapping file, or an empty string if file could not be created. */ - QString IndirectConvertToEnergy::createMapFile(const QString& groupType) + QString ISISEnergyTransfer::createMapFile(const QString& groupType) { QString specRange = m_uiForm.spSpectraMin->text() + "," + m_uiForm.spSpectraMax->text(); @@ -361,7 +361,7 @@ namespace CustomInterfaces * * @return A vector of save formats */ - std::vector IndirectConvertToEnergy::getSaveFormats() + std::vector ISISEnergyTransfer::getSaveFormats() { std::vector fileFormats; @@ -384,7 +384,7 @@ namespace CustomInterfaces /** * Plots raw time data from .raw file before any data conversion has been performed. */ - void IndirectConvertToEnergy::plotRaw() + void ISISEnergyTransfer::plotRaw() { using MantidQt::API::BatchAlgorithmRunner; @@ -461,7 +461,7 @@ namespace CustomInterfaces * * @param error Indicates if the algorithm chain failed */ - void IndirectConvertToEnergy::plotRawComplete(bool error) + void ISISEnergyTransfer::plotRawComplete(bool error) { disconnect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this, SLOT(plotRawComplete(bool))); @@ -479,7 +479,7 @@ namespace CustomInterfaces /** * Called when a user starts to type / edit the runs to load. */ - void IndirectConvertToEnergy::pbRunEditing() + void ISISEnergyTransfer::pbRunEditing() { emit updateRunButton(false, "Editing...", "Run numbers are curently being edited."); } @@ -487,7 +487,7 @@ namespace CustomInterfaces /** * Called when the FileFinder starts finding the files. */ - void IndirectConvertToEnergy::pbRunFinding() + void ISISEnergyTransfer::pbRunFinding() { emit updateRunButton(false, "Finding files...", "Searchig for data files for the run numbers entered..."); m_uiForm.dsRunFiles->setEnabled(false); @@ -496,7 +496,7 @@ namespace CustomInterfaces /** * Called when the FileFinder has finished finding the files. */ - void IndirectConvertToEnergy::pbRunFinished() + void ISISEnergyTransfer::pbRunFinished() { if(!m_uiForm.dsRunFiles->isValid()) { diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp index 3f88108cc96c..32405ccbfd57 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp +++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp @@ -9,14 +9,14 @@ #include "MantidKernel/ConfigService.h" #include "MantidQtAPI/HelpWindow.h" #include "MantidQtAPI/ManageUserDirectories.h" -#include "MantidQtCustomInterfaces/Indirect/IndirectCalibration.h" -#include "MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h" #include "MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h" -#include "MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h" #include "MantidQtCustomInterfaces/Indirect/IndirectMoments.h" #include "MantidQtCustomInterfaces/Indirect/IndirectSqw.h" #include "MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h" #include "MantidQtCustomInterfaces/Indirect/IndirectTransmission.h" +#include "MantidQtCustomInterfaces/Indirect/ISISCalibration.h" +#include "MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h" +#include "MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h" #include #include @@ -116,9 +116,9 @@ void IndirectDataReduction::initLayout() updateRunButton(false, "Loading UI", "Initialising user interface components..."); // Create the tabs - m_tabs["Energy Transfer"] = new IndirectConvertToEnergy(this, m_uiForm.twIDRTabs->findChild("loEnergyTransfer")); - m_tabs["Calibration"] = new IndirectCalibration(this, m_uiForm.twIDRTabs->findChild("loCalibration")); - m_tabs["Diagnostics"] = new IndirectDiagnostics(this, m_uiForm.twIDRTabs->findChild("loDiagnostics")); + m_tabs["Energy Transfer"] = new ISISEnergyTransfer(this, m_uiForm.twIDRTabs->findChild("loEnergyTransfer")); + m_tabs["Calibration"] = new ISISCalibration(this, m_uiForm.twIDRTabs->findChild("loCalibration")); + m_tabs["Diagnostics"] = new ISISDiagnostics(this, m_uiForm.twIDRTabs->findChild("loDiagnostics")); m_tabs["Transmission"] = new IndirectTransmission(this, m_uiForm.twIDRTabs->findChild("loTransmission")); m_tabs["Symmetrise"] = new IndirectSymmetrise(this, m_uiForm.twIDRTabs->findChild("loSymmetrise")); m_tabs["S(Q, w)"] = new IndirectSqw(this, m_uiForm.twIDRTabs->findChild("loSofQW"));