Skip to content

Commit

Permalink
Merge pull request #38149 from mantidproject/revert-38057-38053_SANS_…
Browse files Browse the repository at this point in the history
…compatibility_mode_off_by_default

Revert "Turn ISIS SANS compatibility mode off by default"
  • Loading branch information
SilkeSchomann authored Oct 7, 2024
2 parents 7daad5d + 5ca119a commit 78d8466
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 9 deletions.
3 changes: 0 additions & 3 deletions docs/source/interfaces/isis_sans/Settings Tab.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ use 8, 9, 10, 12, 14, 16, 20, 21, 22.
Compatibility Mode
""""""""""""""""""

*As of version 6.11 of Mantid, this feature is no longer enabled by default.
It should be considered deprecated and will be removed in a future release.*

The previous SANS GUI converted event-mode data to histogram-mode early into
processing. This used the time-of-flight binning parameters specified by the
user or copied the monitor binning.
Expand Down
1 change: 0 additions & 1 deletion docs/source/release/v6.11.0/SANS/New_features/38053.rst

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/Interface/ui/sans_isis/sans_data_processor_window.ui
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ QGroupBox::title {
<item>
<widget class="QStackedWidget" name="main_stacked_widget">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="run_page">
<layout class="QVBoxLayout" name="verticalLayout_3">
Expand Down Expand Up @@ -988,7 +988,7 @@ QGroupBox::title {
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_16">
<item row="0" column="0">
Expand Down
2 changes: 1 addition & 1 deletion scripts/SANS/sans/state/StateObjects/StateCompatibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
class StateCompatibility(metaclass=JsonSerializable):
def __init__(self):
super(StateCompatibility, self).__init__()
self.use_compatibility_mode = False # : Bool
self.use_compatibility_mode = True # : Bool
self.use_event_slice_optimisation = False # : Bool
self.time_rebin_string = "" # Str

Expand Down
4 changes: 2 additions & 2 deletions scripts/test/SANS/gui_logic/state_gui_model_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ def test_that_default_instrument_is_NoInstrument(self):
# ------------------------------------------------------------------------------------------------------------------
# Compatibility Mode
# ------------------------------------------------------------------------------------------------------------------
def test_that_default_compatibility_mode_is_false(self):
def test_that_default_compatibility_mode_is_true(self):
state_gui_model = StateGuiModel(AllStates())
self.assertFalse(state_gui_model.compatibility_mode)
self.assertTrue(state_gui_model.compatibility_mode)

def test_that_can_set_compatibility_mode(self):
state_gui_model = StateGuiModel(AllStates())
Expand Down

0 comments on commit 78d8466

Please sign in to comment.