Skip to content

Commit

Permalink
Refs #8535.
Browse files Browse the repository at this point in the history
Merge branch 'feature/8528_slice_event' into feature/8535_gui_slicing_support
  • Loading branch information
gesnerpassos committed Dec 3, 2013
2 parents e3993ba + 3327bcc commit 9329891
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions Code/Mantid/scripts/SANS/ISISCommandInterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ def MaskFile(file_name):
@param file_name: the settings file
"""
_printMessage('#Opening "'+file_name+'"')

# ensure that no slice string is kept from previous executions.
ReductionSingleton().setSlicesLimits("")

ReductionSingleton().user_settings = isis_reduction_steps.UserFile(
file_name)
status = ReductionSingleton().user_settings.execute(
Expand Down
7 changes: 4 additions & 3 deletions Code/Mantid/scripts/SANS/isis_reducer.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,16 +174,17 @@ def _init_steps(self):
self._rem_nans = sans_reduction_steps.StripEndNans()

self.set_Q_output_type(self.to_Q.output_type)
# keep information about event slicing
self._slices_def = []
self._slice_index = 0


def _clean_loaded_data(self):
self._sample_run = Sample()
self._can_run = Can()
self.samp_trans_load = None
self.can_trans_load = None
self.event2hist = isis_reduction_steps.SliceEvent()
# keep information about event slicing
self._slices_def = []
self._slice_index = 0


def __init__(self):
Expand Down

0 comments on commit 9329891

Please sign in to comment.