Removed log logs option from code and GUI.

Refs #7713
mantidproject · Sep 5, 2013 · 3263069 · 3263069
1 parent 14fedf7
commit 3263069
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 34 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
@@ -287,13 +287,6 @@
                     </property>
                    </widget>
                   </item>
-                  <item>
-                   <widget class="QCheckBox" name="ckLoadLogs">
-                    <property name="text">
-                     <string>Load Logs</string>
-                    </property>
-                   </widget>
-                  </item>
                   <item>
                    <widget class="QCheckBox" name="ckUseCalib">
                     <property name="toolTip">

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect.cpp
@@ -258,11 +258,6 @@ void Indirect::runConvertToEnergy()
       "reducer.set_calibration_workspace(loadNexus(r'"+m_uiForm.ind_calibFile->getFirstFilename()+"'))\n";
   }
 
-  if ( m_uiForm.ckLoadLogs->isChecked() )
-  {
-    pyInput += "reducer.set_load_logs(True)\n";
-  }
-
   if ( ! m_uiForm.rebin_ckDNR->isChecked() )
   {
     QString rebin;

diff --git a/Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py b/Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py
@@ -23,7 +23,6 @@ class LoadData(ReductionStep):
 
     _multiple_frames = False
     _sum = False
-    _load_logs = False
     _monitor_index = None
     _detector_range_start = None
     _detector_range_end = None
@@ -38,7 +37,6 @@ def __init__(self):
         """
         super(LoadData, self).__init__()
         self._sum = False
-        self._load_logs = False
         self._multiple_frames = False
         self._monitor_index = None
         self._detector_range_start = None
@@ -71,9 +69,6 @@ def execute(self, reducer, file_ws):
             self._data_files = {}
             self._data_files[wsname] = wsname
 
-    def set_load_logs(self, value):
-        self._load_logs = value
-
     def set_sum(self, value):
         self._sum = value
 
@@ -165,12 +160,7 @@ def _load_data(self, filename, output_ws):
             loaded_ws = LoadVesuvio(Filename=filename, OutputWorkspace=output_ws, SpectrumList="1-198", **self._extra_load_opts)
             loader_name = "LoadVesuvio"
         else:
-            loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=False, **self._extra_load_opts)
-            if self._load_logs == True:
-                loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=True, **self._extra_load_opts)
-                logger.notice("Loaded sample logs")
-            else:
-                loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=False, **self._extra_load_opts)
+            loaded_ws = Load(Filename=filename, OutputWorkspace=output_ws, LoadLogFiles=True, **self._extra_load_opts)
             loader_handle = loaded_ws.getHistory().lastAlgorithm()
             loader_name = loader_handle.getPropertyValue("LoaderName")
         return loader_name

diff --git a/Code/Mantid/scripts/Inelastic/msg_reducer.py b/Code/Mantid/scripts/Inelastic/msg_reducer.py
@@ -16,7 +16,6 @@ class MSGReducer(reducer.Reducer):
 
     _instrument_name = None #: Name of the instrument used in experiment.
     _sum = False #: Whether to sum input files or treat them sequentially.
-    _load_logs = False #: Whether to load the log file(s) associated with the raw file.
     _monitor_index = None #: Index of Monitor specturm.
     _multiple_frames = False
     _detector_range = [-1, -1]
@@ -37,7 +36,6 @@ def pre_process(self):
         loadData = steps.LoadData()
         loadData.set_ws_list(self._data_files)
         loadData.set_sum(self._sum)
-        loadData.set_load_logs(self._load_logs)
         loadData.set_monitor_index(self._monitor_index)
         loadData.set_detector_range(self._detector_range[0],
             self._detector_range[1])
@@ -148,15 +146,6 @@ def set_sum_files(self, value):
         if not isinstance(value, bool):
             raise TypeError("value must be either True or False (boolean)")
         self._sum = value
-
-    def set_load_logs(self, value):
-        """Mark whether the log file(s) associated with a raw file should be
-        loaded along with the raw file.
-        The default value for this is False.
-        """
-        if not isinstance(value, bool):
-            raise TypeError("value must be either True or False (boolean)")
-        self._load_logs = value
 
     def set_save_formats(self, formats):
         """Selects the save formats in which to export the reduced data.