Skip to content

Commit 0690b26

Browse files
Merge release-next into main
2 parents 693448d + 106a8a3 commit 0690b26

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

docs/source/interfaces/isis_sans/Settings Tab.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ use 8, 9, 10, 12, 14, 16, 20, 21, 22.
104104
Compatibility Mode
105105
""""""""""""""""""
106106

107+
*As of version 6.11 of Mantid, this feature is no longer enabled by default.
108+
It should be considered deprecated and will be removed in a future release.*
109+
107110
The previous SANS GUI converted event-mode data to histogram-mode early into
108111
processing. This used the time-of-flight binning parameters specified by the
109112
user or copied the monitor binning.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- The :ref:`compatibility_mode` feature in the ISIS SANS GUI is no longer selected by default. This feature should be considered deprecated and will be removed completely in a future release.

scripts/Interface/ui/sans_isis/sans_data_processor_window.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ QGroupBox::title {
9595
<item>
9696
<widget class="QStackedWidget" name="main_stacked_widget">
9797
<property name="currentIndex">
98-
<number>0</number>
98+
<number>1</number>
9999
</property>
100100
<widget class="QWidget" name="run_page">
101101
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -988,7 +988,7 @@ QGroupBox::title {
988988
<bool>true</bool>
989989
</property>
990990
<property name="checked">
991-
<bool>true</bool>
991+
<bool>false</bool>
992992
</property>
993993
<layout class="QGridLayout" name="gridLayout_16">
994994
<item row="0" column="0">

scripts/SANS/sans/state/StateObjects/StateCompatibility.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
class StateCompatibility(metaclass=JsonSerializable):
2929
def __init__(self):
3030
super(StateCompatibility, self).__init__()
31-
self.use_compatibility_mode = True # : Bool
31+
self.use_compatibility_mode = False # : Bool
3232
self.use_event_slice_optimisation = False # : Bool
3333
self.time_rebin_string = "" # Str
3434

scripts/test/SANS/gui_logic/state_gui_model_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ def test_that_default_instrument_is_NoInstrument(self):
3535
# ------------------------------------------------------------------------------------------------------------------
3636
# Compatibility Mode
3737
# ------------------------------------------------------------------------------------------------------------------
38-
def test_that_default_compatibility_mode_is_true(self):
38+
def test_that_default_compatibility_mode_is_false(self):
3939
state_gui_model = StateGuiModel(AllStates())
40-
self.assertTrue(state_gui_model.compatibility_mode)
40+
self.assertFalse(state_gui_model.compatibility_mode)
4141

4242
def test_that_can_set_compatibility_mode(self):
4343
state_gui_model = StateGuiModel(AllStates())

0 commit comments

Comments
 (0)