replace global final rebin checkbox with a button that enables final rebin for all runs

Author: backmari

src/quicknxs/interfaces/configuration.py

@@ -35,8 +35,7 @@ class Configuration(object):
     sample_size = 10
     use_constant_q = False
     wl_bandwidth = 3.2
-    # Final Q rebin global options
-    do_final_rebin_global = False
+    # Final Q rebin global option
     final_rebin_step_global = -0.02
     # Normalize to unity when stitching
     normalize_to_unity = True
@@ -75,7 +74,6 @@ def setup_default_values(cls):
         cls.sample_size = 10
         cls.use_constant_q = False
         cls.wl_bandwidth = 3.2
-        cls.do_final_rebin_global = False
         cls.final_rebin_step_global = -0.02
         cls.normalize_to_unity = True
         cls.total_reflectivity_q_cutoff = 0.01

src/quicknxs/interfaces/data_handling/data_set.py

@@ -801,15 +801,6 @@ def _as_ints(a):
 
         direct_beam_low_res_roi = get_direct_beam_low_res_roi(conf, direct_beam.configuration)
 
-        final_rebin = False
-        q_step = 0.0
-        if conf.do_final_rebin_global:
-            final_rebin = True
-            q_step = conf.final_rebin_step_global
-        else:
-            final_rebin = conf.do_final_rebin_run
-            q_step = conf.final_rebin_step_run
-
         # The reduced data workspace may be a group or a single
         # workspace depending on the InputWorkspace parameter
         ws = api.MagnetismReflectometryReduction(
@@ -827,9 +818,9 @@ def _as_ints(a):
             CutLowResNormAxis=True,
             LowResNormAxisPixelRange=direct_beam_low_res_roi,
             CutTimeAxis=True,
-            FinalRebin=final_rebin,
+            FinalRebin=conf.do_final_rebin_run,
             QMin=0.001,
-            QStep=q_step,
+            QStep=conf.final_rebin_step_run,
             RoundUpPixel=False,
             AngleOffset=angle_offset,
             UseWLTimeAxis=False,
@@ -840,7 +831,7 @@ def _as_ints(a):
             ConstantQBinning=conf.use_constant_q,
             ConstQTrim=0.1,
             CropFirstAndLastPoints=False,
-            CleanupBadData=final_rebin,
+            CleanupBadData=conf.do_final_rebin_run,
             AcceptNullReflectivity=True,  # return empty reflectivity curves (all intensities are zero)
             ErrorWeightedBackground=False,
             SampleLength=conf.sample_size,

src/quicknxs/interfaces/event_handlers/configuration_handler.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 
-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QAction, QCheckBox, QDoubleSpinBox, QSpinBox, QWidget
+from qtpy import QtCore
+from qtpy.QtWidgets import QAction, QCheckBox, QDoubleSpinBox, QSpinBox, QWidget
 
 from quicknxs.interfaces.configuration import Configuration
 
@@ -41,7 +41,7 @@ def config_setter_factory(self, qwidget: QWidget, config_name: str):
         def config_setter():
             if isinstance(qwidget, QCheckBox):
                 value = qwidget.checkState()
-                bool_value = value == Qt.CheckState.Checked
+                bool_value = value == QtCore.Qt.Checked
                 setattr(Configuration, config_name, bool_value)
             elif isinstance(qwidget, QAction):
                 value = qwidget.isChecked()
@@ -81,8 +81,7 @@ class ConfigWidget:
             recalc_reflectivity: bool = False
 
         config_widgets = [
-            ConfigWidget("final_rebin_checkbox_global", "do_final_rebin", recalc_reflectivity=True),
-            ConfigWidget("q_rebin_spinbox_global", "final_rebin_step", recalc_reflectivity=True),
+            ConfigWidget("q_rebin_spinbox_global", "final_rebin_step_global"),
             ConfigWidget("normalize_to_unity_checkbox", "normalize_to_unity"),
             ConfigWidget("normalization_q_cutoff_spinbox", "total_reflectivity_q_cutoff"),
             ConfigWidget("global_fit_checkbox", "global_stitching"),

src/quicknxs/interfaces/event_handlers/main_handler.py

@@ -859,12 +859,9 @@ def update_reduction_table(self, table_widget: QtWidgets.QTableWidget, idx: int,
             direct_beam = d.configuration.direct_beam
         table_widget.setItem(idx, 12, QtWidgets.QTableWidgetItem(str(direct_beam)))
         if d.configuration.do_final_rebin_run:
-            item = QtWidgets.QTableWidgetItem(str(d.configuration.final_rebin_step_run))
+            item = QtWidgets.QTableWidgetItem(f"{d.configuration.final_rebin_step_run:.3f}")
         else:
             item = QtWidgets.QTableWidgetItem("")
-        if d.configuration.do_final_rebin_global:
-            item.setFlags(item.flags() & ~QtCore.Qt.ItemIsEditable)
-            item.setBackground(QColors.light_grey)
         table_widget.setItem(idx, 13, item)
 
         self.main_window.auto_change_active = False
@@ -1350,15 +1347,6 @@ def check_region_values_changed(self):
                 valid_change or not configuration.direct_angle_offset_overwrite == self.ui.dangle0Overwrite.value()
             )
 
-        # Final rebin
-        valid_change = (
-            valid_change or not configuration.do_final_rebin_global == self.ui.final_rebin_checkbox_global.isChecked()
-        )
-
-        valid_change = (
-            valid_change or not configuration.final_rebin_step_global == self.ui.q_rebin_spinbox_global.value()
-        )
-
         valid_change = (
             valid_change or not configuration.do_final_rebin_run == self.ui.final_rebin_checkbox_run.isChecked()
         )
@@ -1429,7 +1417,6 @@ def get_configuration(self) -> Configuration:
         configuration.direct_pixel_overwrite = self.ui.directPixelOverwrite.value()
         configuration.direct_angle_offset_overwrite = self.ui.dangle0Overwrite.value()
         Configuration.sample_size = self.ui.sample_size_spinbox.value()
-        Configuration.do_final_rebin_global = self.ui.final_rebin_checkbox_global.isChecked()
         Configuration.final_rebin_step_global = self.ui.q_rebin_spinbox_global.value()
 
         Configuration.apply_deadtime = self.ui.deadtime_entry.applyCheckBox.isChecked()
@@ -1537,7 +1524,6 @@ def populate_from_configuration(self, configuration=None):
         self.ui.directPixelOverwrite.setValue(configuration.direct_pixel_overwrite)
         self.ui.dangle0Overwrite.setValue(configuration.direct_angle_offset_overwrite)
         self.ui.sample_size_spinbox.setValue(configuration.sample_size)
-        self.ui.final_rebin_checkbox_global.setChecked(configuration.do_final_rebin_global)
         self.ui.q_rebin_spinbox_global.setValue(configuration.final_rebin_step_global)
 
         self.ui.deadtime_entry.applyCheckBox.setChecked(configuration.apply_deadtime)
@@ -1770,40 +1756,34 @@ def show_results(self):
         self.main_window.update_gisans_viewer.connect(dialog.update_gisans)
         dialog.show()
 
-    def toggle_final_rebin_global(self, state: int):
-        """Toggle global rebin checkbox.
+    def propagate_final_rebin_to_run_config(self):
+        """Enable final rebin with the given Q-step for all runs in the active data tab.
 
-        Ensure mutual exclusivity with the per-run rebin checkbox.
+        Note: This function updates the UI and internal configuration state while blocking all signals.
+        The caller is responsible for triggering recalculation and replotting.
         """
-        if state == QtCore.Qt.Checked:
-            self.ui.final_rebin_checkbox_run.blockSignals(True)
-            self.ui.final_rebin_checkbox_run.setChecked(False)
-            self.ui.final_rebin_checkbox_run.blockSignals(False)
-
-        # col_index = self.ui.reductionTable.get_column_index("Q-Steps")
-        col_index = 13
-        self.ui.reductionTable.blockSignals(True)
-        for row in range(self.ui.reductionTable.rowCount()):
-            item = self.ui.reductionTable.item(row, col_index)
-            if item is None:
-                item = QtWidgets.QTableWidgetItem("")
-            if item:
-                if state == QtCore.Qt.Checked:
-                    _item = QtWidgets.QTableWidgetItem(item.text())
-                    _item.setFlags(item.flags() & ~QtCore.Qt.ItemIsEditable)
-                    _item.setBackground(QColors.light_grey)
-                    self.ui.reductionTable.setItem(row, col_index, _item)
-                else:
-                    _item = QtWidgets.QTableWidgetItem(item.text())
-                    _item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable)
-                    _item.setBackground(QColors.white)
-                    self.ui.reductionTable.setItem(row, col_index, _item)
-        self.ui.reductionTable.blockSignals(False)
-
-    def toggle_final_rebin_run(self, state: int):
-        """Toggle per-run rebin checkbox.
+        q_step = self.ui.q_rebin_spinbox_global.value()
 
-        Ensure mutual exclusivity with the global rebin checkbox.
-        """
-        if state == QtCore.Qt.Checked:
-            self.ui.final_rebin_checkbox_global.setChecked(False)
+        # loop over runs in the active data tab to update internal state and UI state
+        reduct_list = self._data_manager.reduction_list
+        for idx, nexus_data in enumerate(reduct_list):
+            active_cross_section_name: str = self._data_manager.active_cross_section.name
+            active_cross_section = nexus_data.cross_sections[active_cross_section_name]
+            # get the current configuration state
+            conf = active_cross_section.configuration
+            # update the run final rebin configuration state
+            conf.do_final_rebin_run = True
+            conf.final_rebin_step_run = q_step
+            nexus_data.update_configuration(conf)
+            # update the UI reduction table to reflect the configuration state (signals are blocked)
+            self.update_reduction_table(self.reduction_table, idx, active_cross_section)
+
+        # update the run final rebin spinbox value
+        self.ui.q_rebin_spinbox_run.blockSignals(True)
+        self.ui.q_rebin_spinbox_run.setValue(q_step)
+        self.ui.q_rebin_spinbox_run.blockSignals(False)
+
+        # update the run final rebin checkbox
+        self.ui.final_rebin_checkbox_run.blockSignals(True)
+        self.ui.final_rebin_checkbox_run.setChecked(True)
+        self.ui.final_rebin_checkbox_run.blockSignals(False)

src/quicknxs/interfaces/main_window.py

@@ -576,15 +576,12 @@ def reload_all_files(self):
         """Reload all previously loaded files upon change in loading configuration."""
         self.file_handler.reload_all_files()
 
-    def toggleFinalRebinRun(self, state):
-        """Signal handling."""
-        self.file_handler.toggle_final_rebin_run(state)
-        self.changeRegionValues()
-
-    def toggleFinalRebinGlobal(self, state):
-        """Signal handling."""
-        self.file_handler.toggle_final_rebin_global(state)
-        self.file_handler.get_configuration()
+    def propagate_final_rebin_to_runs(self):
+        """Enable final rebin for all runs with Q-step from the UI input `q_rebin_spinbox_global`."""
+        # update the internal configuration state
+        self.file_handler.propagate_final_rebin_to_run_config()
+        # recalculate and replot reflectivity
+        self.global_reflectivity_config_changed()
 
     # Un-used UI signals
     def change_gisans_colorscale(self):

src/quicknxs/ui/ui_main_window.ui

@@ -425,16 +425,21 @@
              <number>1</number>
             </property>
             <item row="0" column="1">
-             <widget class="QCheckBox" name="final_rebin_checkbox_global">
+             <widget class="QPushButton" name="propagate_final_rebin_button">
               <property name="toolTip">
-               <string>Check for apply a final Q rebinning globally. This will be used instead of any per-run Q-Step values.</string>
+               <string>Enable final rebin with the given Q-step for all runs.</string>
               </property>
               <property name="text">
-               <string>Final rebin</string>
+               <string>Enable final rebin</string>
               </property>
               <property name="checked">
                <bool>true</bool>
               </property>
+              <property name="font">
+               <font>
+                <pointsize>10</pointsize>
+               </font>
+              </property>
              </widget>
             </item>
             <item row="0" column="2">
@@ -6531,6 +6536,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>q_rebin_spinbox_run</sender>
+   <signal>editingFinished()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>changeRegionValues()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>342</x>
+     <y>747</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>543</x>
+     <y>416</y>
+    </hint>
+   </hints>
+  </connection>
   <connection>
    <sender>normalizeXTof</sender>
    <signal>stateChanged(int)</signal>
@@ -6643,6 +6664,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>propagate_final_rebin_button</sender>
+   <signal>pressed()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>propagate_final_rebin_to_runs()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>114</x>
+     <y>518</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>3</x>
+     <y>453</y>
+    </hint>
+   </hints>
+  </connection>
   <connection>
    <sender>reload_file_button</sender>
    <signal>pressed()</signal>
@@ -7395,27 +7432,11 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>final_rebin_checkbox_global</sender>
-   <signal>stateChanged(int)</signal>
-   <receiver>MainWindow</receiver>
-   <slot>toggleFinalRebinGlobal()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>59</x>
-     <y>579</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>-1</x>
-     <y>536</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>final_rebin_checkbox_run</sender>
    <signal>stateChanged(int)</signal>
    <receiver>MainWindow</receiver>
-   <slot>toggleFinalRebinRun()</slot>
+   <slot>changeRegionValues()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>110</x>
@@ -7481,8 +7502,6 @@
   <slot>stripOverlap()</slot>
   <slot>toggle_smoothing()</slot>
   <slot>toggleColorbars()</slot>
-  <slot>toggleFinalRebinGlobal()</slot>
-  <slot>toggleFinalRebinRun()</slot>
   <slot>update_offspec_qz_bin_width()</slot>
  </slots>
 </ui>