Fixing some bugs, check segment start

Author: JoschD

omc3_gui/plotting/classes.py

@@ -43,6 +43,7 @@ def plots(self) -> tuple[pg.PlotWidget, pg.PlotWidget]:
     def clear(self) -> None:    
         for plot in self.plots:
             plot.clear()
+            plot.enableAutoRange()
 
     def set_connect_x(self, connect: bool) -> None:
         if connect:

omc3_gui/plotting/tfs_plotter.py

@@ -34,6 +34,7 @@ def plot_dataframes(
     legend: bool = True,
     brightness: int | None = None,
     marker: str = 'o',
+    markersize: float = 6,
     linestyle: PenStyle = PenStyle.SolidLine,
     suffix: str = "",
     ):
@@ -52,6 +53,7 @@ def plot_dataframes(
         legend (bool, optional): Whether to add a legend to the plot. Defaults to True.
         brightness (int, optional): The brightness of the colors to use. Defaults to None.
         marker (str, optional): The marker to use for the data points. Defaults to 'o'.
+        markersize (float, optional): The size of the markers to use for the data points. Defaults to 6.
         linestyle (PenStyle, optional): The linestyle to use for the data points. Defaults to PenStyle.SolidLine.
         suffix (str, optional): The suffix to add to the legend. Defaults to "".
     """
@@ -80,6 +82,7 @@ def plot_dataframes(
             label=f"{name}{suffix}", 
             color=color,
             marker=marker,
+            markersize=markersize,
             linestyle=linestyle,
         )
 
@@ -90,7 +93,8 @@ def plot_dataframes(
         plot_item.setLabel("left", ylabel)
 
     plot_item.legend.setVisible(legend)
-        
+
+
 def plot_errorbar(
     plot: pg.PlotItem,
     *,
@@ -102,7 +106,7 @@ def plot_errorbar(
     label: str | None = None,
     color: str | pg.Color | None = None,
     marker: str = 'o', 
-    markersize: int = 6,
+    markersize: float = 6,
     linestyle: PenStyle = PenStyle.SolidLine,
     linewidth: float = 2,
     ) -> tuple[pg.PlotDataItem, pg.ErrorBarItem]:
@@ -121,8 +125,9 @@ def plot_errorbar(
         label (str | None, optional): The label of the errorbar. Defaults to None.
         color (str | None, optional): The color of the errorbar. Defaults to None.
         marker (str, optional): The marker of the errorbar. Defaults to 'o'.
-        markersize (int, optional): The markersize of the errorbar. Defaults to 10.
+        markersize (float, optional): The markersize of the errorbar. Defaults to 10.
         linestyle (PenStyle, optional): The linestyle of the errorbar. Defaults to PenStyle.SolidLine.
+        linewidth (float, optional): The linewidth of the errorbar. Defaults to 2.
     """
 
     curvePen = pg.mkPen(color=color, width=linewidth, style=linestyle)    

omc3_gui/sbs_gui.py

@@ -0,0 +1,18 @@
+""" 
+Segment-by-Segment GUI
+----------------------
+
+Graphical user interface to run the Segment-by-Segment propagation.
+"""
+import sys
+from omc3_gui.segment_by_segment.main_controller import SbSController
+from omc3_gui.utils.log_handler import init_logging
+
+# --- For QT Debugging ----------------
+# import os
+# os.environ["QT_DEBUG_PLUGINS"] = "1"
+# -------------------------------------
+
+if __name__ == "__main__":
+    init_logging()
+    sys.exit(SbSController.run_application())

omc3_gui/segment_by_segment.py

@@ -33,11 +33,10 @@
     "kq6.{}{}b{}",
     "kq5.{}{}b{}",
     "kq4.{}{}b{}",
-    "kqx.{}{}b{}",
-    "kqsx3.{}{}b{}",
-    "ktqx2.{}{}b{}",
-    "ktqx1.{}{}b{}",
-    "kqx.{}{}b{}",
+    "kqsx3.{}{}",
+    "ktqx2.{}{}",
+    "ktqx1.{}{}",
+    "kqx.{}{}",
 )
 
 def get_default_correctors(measurement: OpticsMeasurement) -> str:

omc3_gui/segment_by_segment/defaults.py

@@ -9,6 +9,7 @@
 import logging
 from functools import partial
 from pathlib import Path
+import re
 from typing import TYPE_CHECKING
 
 from omc3.sbs_propagation import segment_by_segment
@@ -71,7 +72,7 @@ def connect_signals(self):
         view.add_settings_to_menu(
             menu="View",
             settings=self.settings.plotting,
-            hook=partial(self.plot, weak=True),  # update plots if possible
+            hook=partial(self.plot, fail_ok=True),  # update plots if possible
         )
 
         # Measurements -------------------------------------------------------------
@@ -488,10 +489,6 @@ def segment_selection_changed(self, segments: Sequence[SegmentItemModel] | None
             return
 
         self.set_segment_interaction_buttons_enabled(True)
-        if len(segments) > 1:
-            LOGGER.debug("More than one segment selected. Clearing Plots.")
-            return
-
         self.plot()
 
     @Slot()
@@ -524,7 +521,8 @@ def add_default_segements_to_measurement(self, measurement: OpticsMeasurement):
                 segment = SegmentDataModel(measurement, *segment_tuple)
                 segment.start = f"{segment.start}.B{measurement.beam}"
                 segment.end = f"{segment.end}.B{measurement.beam}"
-                measurement.try_add_segment(segment)
+                measurement.try_add_segment(segment, silent=True)
+            return
 
         # TODO: Implement for other accelerators
         LOGGER.error(f"No beam found in measurement {measurement.display()}. Cannot add default segments.")
@@ -543,6 +541,7 @@ def new_segment(self):
 
         LOGGER.debug("Opening edit dialog for a new segment.")
         dialog = SegmentDialog(parent=view)
+        dialog.validate_only_modified = False
         if dialog.exec_() == dialog.Rejected:
             LOGGER.debug("Segment dialog cancelled.")
             return
@@ -579,7 +578,7 @@ def copy_segment(self, segments: Sequence[SegmentItemModel] | None = None):
             return
 
         for segment_item in segments:
-            new_segment_name = f"{segment_item.name} - Copy"
+            new_segment_name = f"{segment_item.name}_copy"
             for measurement in selected_measurements:  
                 # Check if copied segment name already exists in one of the measurements
                 try:
@@ -597,6 +596,7 @@ def copy_segment(self, segments: Sequence[SegmentItemModel] | None = None):
                     for segment in segment_item.segments:
                         new_segment = segment.copy()
                         new_segment.name = new_segment_name
+                        new_segment.measurement = measurement
                         measurement.try_add_segment(new_segment)
 
         self.measurement_selection_changed(selected_measurements)
@@ -619,16 +619,12 @@ def remove_segment(self, segments: Sequence[SegmentItemModel] | None = None):
             return
 
         LOGGER.debug(f"Removing {len(segments)} segments.")
-        selected_measurements = view.get_selected_measurements()
-        if not selected_measurements:
-            LOGGER.error("Please select at least one measurement.")
-            return
 
-        for measurement in selected_measurements:
-            for segment_item in segments:
-                measurement.try_remove_segment(segment_item.name)
-
-        self.measurement_selection_changed(selected_measurements)
+        for segment_item in segments:
+            for segment_data in segment_item.segments:
+                segment_data.measurement.remove_segment(segment_data)
+        
+        self.measurement_selection_changed(view.get_selected_measurements())
 
     @Slot()
     def load_segments(self):
@@ -749,7 +745,7 @@ def clear_all():
             # -------------------------------------
 
 # Plotting ---------------------------------------------------------------------
-    def plot(self, weak: bool = False):
+    def plot(self, fail_ok: bool = False):
         """ Trigger a plot update with the currently selected segments. """
         view: SbSWindow = self._view
         settings: PlotSettings = self.settings.plotting
@@ -763,14 +759,27 @@ def plot(self, weak: bool = False):
         widget.set_connect_y(settings.connect_y)
 
         segments = view.get_selected_segments()
-        if len(segments) != 1:
-            if not weak:
+        if not len(segments):
+            if not fail_ok:
                 LOGGER.error("Please select exactly one segment to plot.")
             return
 
-        self.clear_plots()
+
+        segments_data: list[SegmentDataModel] = [s_data for s in segments for s_data in s.segments if s_data.has_run()]
+        if not len(segments_data):
+            if not fail_ok:
+                LOGGER.error("Please run at least one segment before plotting.")
+            return
+
+        if settings.same_start:
+            starts = {re.sub(r"\.B[12]$", "", s.start, flags=re.IGNORECASE) for s in segments_data}
+            if len(starts) > 1:
+                if not fail_ok:
+                    LOGGER.error("Please select segments with the same starting element.")
+                return
 
-        segments_data: list[SegmentDataModel] = segments[0].segments
+        self.clear_plots()
+
         plot_segment_data(
             widget=widget, 
             definition=definition, 
@@ -795,5 +804,5 @@ def show_settings(self):
                 menu="View",
                 settings=self.settings.plotting,
             )
-            self.plot(weak=True)
+            self.plot(fail_ok=True)
 

omc3_gui/segment_by_segment/main_controller.py

@@ -151,10 +151,15 @@ def update_settings(value: bool, name: str):
 
             if field.name.startswith("_"):
                 continue
+            
+            value = getattr(settings, field.name)
+            if not isinstance(value, bool):
+                continue
+
             label = field.metadata.get("label", field.name)
             entry = QtWidgets.QAction(label, self)
             entry.setCheckable(True)
-            entry.setChecked(getattr(settings, field.name))
+            entry.setChecked(value)
             entry.toggled.connect(partial(update_settings, name=field.name))
             qmenu.addAction(entry)
         qmenu.addSeparator()
@@ -179,6 +184,9 @@ def update_menu_settings(self, menu: str, settings: object, names: Sequence[str]
 
             label = field.metadata.get("label", field.name)
             entry: QtWidgets.QAction = self.get_action_by_title(label, parent=qmenu)
+            if entry is None:
+                continue
+
             entry.setChecked(getattr(settings, field.name))
 
     def _build_gui(self):

omc3_gui/segment_by_segment/main_view.py

@@ -32,19 +32,24 @@
 DATE: str = "DATE"
 
 FILES_TO_LOOK_FOR: tuple[str, ...] = tuple(f"{name}{plane}" for name in (KICK_NAME, PHASE_NAME, BETA_NAME) for plane in ("x", "y"))
+TO_BE_DEFINED: str = "to_be_defined"
 
 LOGGER = logging.getLogger(__name__)
 
 
+def exists(value: Path | None) -> bool:
+    return value is not None and value.exists()
+
+
 @dataclass(slots=True)
 class OpticsMeasurement:
     """ Class to load and hold the optics-measurement folder. 
     This class also stores the meta-data for the loaded measurement, 
     which can then be passed on to the segment-by-segment.
     The :func:`omc3_gui.utils.dataclass_ui.metafield` is used to provide hints about the fields for the GUI.
     """
-    measurement_dir: DirectoryPath = metafield("Optics Measurement", "Path to the optics-measurement folder")
-    model_dir: DirectoryPath =       metafield("Model",              "Path to the model folder",        default=None)
+    measurement_dir: DirectoryPath = metafield("Optics Measurement", "Path to the optics-measurement folder", default=Path(TO_BE_DEFINED), validate=exists)
+    model_dir: DirectoryPath =       metafield("Model",              "Path to the model folder",        default=Path(TO_BE_DEFINED), validate=exists)
     accel: str =                     metafield("Accelerator",        "Name of the accelerator",         default=None)
     output_dir: DirectoryPath =      metafield("Output",             "Path to the sbs-output folder",   default=None) 
     corrections: FilePath =          metafield("Corrections",        "Path to the corrections file",    default=None)
@@ -114,11 +119,14 @@ def add_segment(self, segment: SegmentDataModel):
 
         self.segments.append(segment)
 
-    def try_add_segment(self, segment: SegmentDataModel) -> bool:
+    def try_add_segment(self, segment: SegmentDataModel, silent: bool = False) -> bool:
         try:
             self.add_segment(segment)
         except NameError as e:
-            LOGGER.error(str(e))
+            if silent:
+                LOGGER.debug(str(e))
+            else: 
+                LOGGER.error(str(e))
             return False
         return True
 

omc3_gui/segment_by_segment/measurement_model.py

@@ -5,12 +5,10 @@
 This module contains the view for the measurement dialog.
 """
 from dataclasses import fields
-from pathlib import Path
 
 from omc3_gui.segment_by_segment.measurement_model import OpticsMeasurement
 from omc3_gui.ui_components.dataclass_ui import DataClassDialog, FieldUIDef, DataClassUI
 
-TO_BE_DEFINED = Path("to_be_defined")
 
 
 class OpticsMeasurementDialog(DataClassDialog):
@@ -20,7 +18,7 @@ class OpticsMeasurementDialog(DataClassDialog):
 
     def __init__(self, parent=None, optics_measurement: OpticsMeasurement | None = None):
         if optics_measurement is None:
-            optics_measurement = OpticsMeasurement(measurement_dir=TO_BE_DEFINED, output_dir=TO_BE_DEFINED)
+            optics_measurement = OpticsMeasurement()
 
         non_editable = ("measurement_dir", )  # set by program not by user
         dataclass_ui = DataClassUI(