diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py
index 6ff486da6658dd4fa77ec38d66853c6caa931cf4..56a697540eb63389bcc2cdb05c9b8a607ab8f346 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py
@@ -14,6 +14,7 @@ class ISISIndirectDiffractionReduction(DataProcessorAlgorithm):
_chopped_data = None
_output_ws = None
_data_files = None
+ _load_logs = None
_instrument_name = None
_mode = None
_spectra_range = None
@@ -38,6 +39,9 @@ class ISISIndirectDiffractionReduction(DataProcessorAlgorithm):
self.declareProperty(name='SumFiles', defaultValue=False,
doc='Enabled to sum spectra from each input file.')
+ self.declareProperty(name='LoadLogFiles', defaultValue=True,
+ doc='Load log files when loading runs')
+
self.declareProperty(name='Instrument', defaultValue='IRIS',
validator=StringListValidator(['IRIS', 'OSIRIS', 'TOSCA', 'VESUVIO']),
doc='Instrument used for run')
@@ -107,6 +111,7 @@ class ISISIndirectDiffractionReduction(DataProcessorAlgorithm):
self._spectra_range[0],
self._spectra_range[1],
self._sum_files,
+ self._load_logs,
load_opts=load_opts)
for c_ws_name in self._workspace_names:
@@ -181,6 +186,7 @@ class ISISIndirectDiffractionReduction(DataProcessorAlgorithm):
self._output_ws = self.getPropertyValue('OutputWorkspace')
self._data_files = self.getProperty('InputFiles').value
+ self._load_logs = self.getProperty('LoadLogFiles').value
self._instrument_name = self.getPropertyValue('Instrument')
self._mode = self.getPropertyValue('Mode')
self._spectra_range = self.getProperty('SpectraRange').value
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
index 2c1d7ebda9884dd0b493e55f053250c88f1fbb50..61b58da06b8e79777ccaba71550fbb966cf353ee 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
@@ -152,6 +152,7 @@ class OSIRISDiffractionReduction(PythonAlgorithm):
_vans = None
_samMap = None
_vanMap = None
+ _load_logs = None
def category(self):
return 'Diffraction;PythonAlgorithms'
@@ -172,6 +173,8 @@ class OSIRISDiffractionReduction(PythonAlgorithm):
self.declareProperty(MatrixWorkspaceProperty('OutputWorkspace', '', Direction.Output),
doc="Name to give the output workspace. If no name is provided, "+\
"one will be generated based on the run numbers.")
+ self.declareProperty(name='LoadLogFiles', defaultValue=True,
+ doc='Load log files when loading runs')
self._cal = None
self._outputWsName = None
@@ -183,6 +186,7 @@ class OSIRISDiffractionReduction(PythonAlgorithm):
# Set OSIRIS as default instrument.
config["default.instrument"] = 'OSIRIS'
+ self._load_logs = self.getProperty('LoadLogFiles').value
self._cal = self.getProperty("CalFile").value
self._outputWsName = self.getPropertyValue("OutputWorkspace")
@@ -201,7 +205,11 @@ class OSIRISDiffractionReduction(PythonAlgorithm):
# Load all sample and vanadium files, and add the resulting workspaces to the DRangeToWsMaps.
for fileName in self._sams + self._vans:
- Load(Filename=fileName, OutputWorkspace=fileName, SpectrumMin=3, SpectrumMax=962)
+ Load(Filename=fileName,
+ OutputWorkspace=fileName,
+ SpectrumMin=3,
+ SpectrumMax=962,
+ LoadLogFiles=self._load_logs)
for sam in self._sams:
self._samMap.addWs(sam)
for van in self._vans:
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui
index 16bd3b464f97fe33f26ebf7636ff86022b6a6011..1755813ee83238f124a29f4a4f0939b132cb4784 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui
@@ -88,6 +88,16 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QCheckBox" name="ckLoadLogs">
+ <property name="text">
+ <string>Load Log Files</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
@@ -443,6 +453,24 @@
<header>MantidQtMantidWidgets/IndirectInstrumentConfig.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>iicInstrumentConfiguration</tabstop>
+ <tabstop>dem_ckSumFiles</tabstop>
+ <tabstop>ckLoadLogs</tabstop>
+ <tabstop>set_leSpecMin</tabstop>
+ <tabstop>set_leSpecMax</tabstop>
+ <tabstop>leRebinStart</tabstop>
+ <tabstop>leRebinWidth</tabstop>
+ <tabstop>leRebinEnd</tabstop>
+ <tabstop>ckIndividualGrouping</tabstop>
+ <tabstop>cbPlotType</tabstop>
+ <tabstop>ckGSS</tabstop>
+ <tabstop>ckNexus</tabstop>
+ <tabstop>ckAscii</tabstop>
+ <tabstop>pbHelp</tabstop>
+ <tabstop>pbRun</tabstop>
+ <tabstop>pbManageDirs</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
index 3af30aedd35e61b6676b16143ad5bb9dfc96f87b..58344f51aab1d38dc72cf0673347a43110d35235 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
@@ -280,6 +280,7 @@ void IndirectDiffractionReduction::runGenericReduction(QString instName, QString
msgDiffReduction->setProperty("Instrument", instName.toStdString());
msgDiffReduction->setProperty("Mode", mode.toStdString());
msgDiffReduction->setProperty("SumFiles", m_uiForm.dem_ckSumFiles->isChecked());
+ msgDiffReduction->setProperty("LoadLogFiles", m_uiForm.ckLoadLogs->isChecked());
msgDiffReduction->setProperty("InputFiles", m_uiForm.dem_rawFiles->getFilenames().join(",").toStdString());
msgDiffReduction->setProperty("SpectraRange", detRange);
msgDiffReduction->setProperty("RebinParam", rebin.toStdString());
@@ -329,6 +330,7 @@ void IndirectDiffractionReduction::runOSIRISdiffonlyReduction()
osirisDiffReduction->setProperty("Sample", m_uiForm.dem_rawFiles->getFilenames().join(",").toStdString());
osirisDiffReduction->setProperty("Vanadium", m_uiForm.dem_vanadiumFile->getFilenames().join(",").toStdString());
osirisDiffReduction->setProperty("CalFile", m_uiForm.dem_calFile->getFirstFilename().toStdString());
+ osirisDiffReduction->setProperty("LoadLogFiles", m_uiForm.ckLoadLogs->isChecked());
osirisDiffReduction->setProperty("OutputWorkspace", drangeWsName.toStdString());
m_batchAlgoRunner->addAlgorithm(osirisDiffReduction);
diff --git a/Code/Mantid/scripts/Inelastic/IndirectReductionCommon.py b/Code/Mantid/scripts/Inelastic/IndirectReductionCommon.py
index c0a4c56d766c448122942bb84727827f1169dfd5..d2569db5318494cb3c1c31669cde5cde7d0f74c3 100644
--- a/Code/Mantid/scripts/Inelastic/IndirectReductionCommon.py
+++ b/Code/Mantid/scripts/Inelastic/IndirectReductionCommon.py
@@ -303,7 +303,8 @@ def unwrap_monitor(workspace_name):
try:
FFTSmooth(InputWorkspace=monitor_workspace_name,
OutputWorkspace=monitor_workspace_name,
- WorkspaceIndex=0)
+ WorkspaceIndex=0,
+ IgnoreXBins=True)
except ValueError:
raise ValueError('Uneven bin widths are not supported.')