alpha beta plots

Author: JoschD

omc3_gui/plotting/latex_to_html.py

@@ -2,6 +2,7 @@
 
 # Dictionary to map Greek LaTeX symbols to HTML
 LATEX_TO_HTML_SYMBOLS = {
+    # Greek ---
     r'\alpha': 'α',
     r'\beta': 'β',
     r'\gamma': 'γ',
@@ -25,8 +26,32 @@
     r'\chi': 'χ',
     r'\psi': 'ψ',
     r'\omega': 'ω',
+    r'\Alpha': 'Α',
+    r'\Beta': 'Β',
+    r'\Gamma': 'Γ',
+    r'\Delta': 'Δ',
+    r'\Epsilon': 'Ε',
+    r'\Zeta': 'Ζ',
+    r'\Eta': 'Η',
+    r'\Theta': 'Θ',
+    r'\Iota': 'Ι',
+    r'\Kappa': 'Κ',
+    r'\Lambda': 'Λ',
+    r'\Mu': 'Μ',
+    r'\Nu': 'Ν',
+    r'\Xi': 'Ξ',
+    r'\Pi': 'Π',
+    r'\Rho': 'Ρ',
+    r'\Sigma': 'Σ',
+    r'\Tau': 'Τ',
+    r'\Upsilon': 'Υ',
+    r'\Phi': 'Φ',
+    r'\Chi': 'Χ',
+    r'\Psi': 'Ψ',
+    r'\Omega': 'Ω',
+    # Spacing ---
     r'\quad': ' ',
-    # You can add more Greek letters as needed
+    r'\;': ' ',
 }
 
 def latex_to_html_converter(latex_str):

omc3_gui/segment_by_segment/main_controller.py

@@ -66,6 +66,9 @@ def connect_signals(self):
         """ Connect the signals from the GUI components (view) to the slots (controller). """
         view: SbSWindow = self._view  # for shorthand and type hinting
 
+        # Tabs -----------------------------------------------------------------
+        view.sig_tab_changed.connect(self.plot)
+
         # Menu Bar -------------------------------------------------------------
         view.sig_menu_settings.connect(self.show_settings)
 

omc3_gui/segment_by_segment/main_view.py

@@ -12,7 +12,7 @@
 import logging
 from collections.abc import Sequence
 
-from omc3.definitions.optics import PHASE_COLUMN, ColumnsAndLabels
+from omc3.definitions.optics import PHASE_COLUMN, BETA_COLUMN, ALPHA_COLUMN, ColumnsAndLabels
 from qtpy import QtGui, QtWidgets
 from qtpy.QtCore import QItemSelectionModel, QModelIndex, Qt, Signal, Slot
 
@@ -41,6 +41,8 @@
 
 class Tabs(IterClass):
     PHASE: ColumnsAndLabels = PHASE_COLUMN
+    BETA: ColumnsAndLabels = BETA_COLUMN 
+    ALPHA: ColumnsAndLabels = ALPHA_COLUMN 
 
 
 class SbSWindow(View):
@@ -51,6 +53,7 @@ class SbSWindow(View):
     sig_list_measurements_selected = Signal(tuple)  # Tuple[OpticsMeasurement]
     sig_table_segments_selected = Signal(tuple)
     sig_thread_spinner_double_clicked = Signal()
+    sig_tab_changed = Signal()
 
     # Menu Signals ---
     sig_menu_settings = Signal()
@@ -97,6 +100,7 @@ def _connect_signals(self):
         # Optics Measurements ---
         self._list_view_measurements.doubleClicked.connect(self._handle_list_measurements_double_clicked)
         self._list_view_measurements.selectionModel().selectionChanged.connect(self._handle_list_measurements_selected)
+        self._tabs_widget.currentChanged.connect(self._handle_tab_changed)
 
     # Slots --------------------------------------------------------------------
     @Slot(QModelIndex)
@@ -115,6 +119,11 @@ def _handle_table_segments_selected(self):
         LOGGER.debug("Segment Table selection changed.")
         selected_segments = self.get_selected_segments()
         self.sig_table_segments_selected.emit(selected_segments)
+    
+    @Slot()
+    def _handle_tab_changed(self):
+        LOGGER.debug("Tab changed.")
+        self.sig_tab_changed.emit()
 
     # GUI-Elements -------------------------------------------------------------
     def _add_menus(self):

omc3_gui/segment_by_segment/plotting.py

@@ -8,8 +8,13 @@
 
 import logging
 
-from omc3.definitions.optics import S_COLUMN, ColumnsAndLabels
-from omc3.segment_by_segment.definitions import PropagableColumns
+from omc3.definitions.optics import (
+    S_COLUMN,
+    S_MODEL_COLUMN,
+    ColumnsAndLabels,
+)
+from omc3.optics_measurements.constants import ALPHA_NAME, BETA_NAME, PHASE_NAME
+from omc3.segment_by_segment.propagables import PropagableColumns
 from qtpy.QtCore import Qt
 
 from omc3_gui.plotting.classes import DualPlot
@@ -23,6 +28,11 @@
 
 PenStyle = Qt.PenStyle
 
+NAME_TO_FILE_MAP = {
+    "alpha": ALPHA_NAME,
+    "beta": BETA_NAME,
+    "phase": PHASE_NAME,
+}
 
 
 def plot_segment_data(widget: DualPlot, definition: ColumnsAndLabels, segments: list[SegmentDataModel], settings: PlotSettings):
@@ -32,6 +42,8 @@ def plot_segment_data(widget: DualPlot, definition: ColumnsAndLabels, segments:
     Assumes all segments have been run. Please check beforehand.
     """
     s_column = S_COLUMN
+    if settings.model_s:
+        s_column = S_MODEL_COLUMN
 
     # use the segment name as label, if there is more than one segment from the same measurement
     use_segment_label = len(set(s.measurement.display() for s in segments)) != len(segments)
@@ -42,7 +54,7 @@ def get_label(segment: SegmentDataModel) -> str:
 
 
     for plane, plot in zip("xy", [widget.top, widget.bottom]): 
-        data_name = f"{definition.text_label}_{plane}"  # coincides with the name in TfsCollection
+        data_name = f"{NAME_TO_FILE_MAP[definition.text_label]}{plane}"
 
         dataframes = {
             get_label(segment): segment.data[data_name] 
@@ -81,7 +93,7 @@ def get_label(segment: SegmentDataModel) -> str:
                     ycolumn=getattr(column_def, column_name),
                     yerrcolumn=getattr(column_def, f"error_{column_name}"),
                     xlabel=s_column.label,
-                    ylabel=latex_to_html_converter(plane_def.label),
+                    ylabel=latex_to_html_converter(plane_def.delta_label),
                     legend=settings.show_legend,
                     marker=marker,
                     markersize=settings.marker_size,

omc3_gui/segment_by_segment/settings.py

@@ -29,6 +29,7 @@ class PlotSettings:
     connect_y: bool = metafield("Connect Y", "Connect Y axes of the two plots.", default=False)
     reset_zoom: bool = metafield("Reset Zoom", "Reset zoom when changing segments.", default=True)
     same_start: bool = metafield("Same Segment Start", "Plot only if the selected segments all have the same starting BPM.", default=True)
+    model_s: bool = metafield("Model Location", "Use the model longitudinal location instead of the segment location.", default=False)
 
 
 @dataclass(slots=True)

omc3_gui/utils/iteration_classes.py

@@ -15,7 +15,7 @@ class IterableAttributeNames(type):
     """ Makes the class itself iterable over its attribute names. """
 
     def __iter__(self) -> Iterator[str]:
-        for attr in dir(self):
+        for attr in self.__dict__.keys():
             if not attr.startswith("__") and attr != EXCLUDED_NAME and attr not in getattr(self, EXCLUDED_NAME, []):
                 yield attr
 
@@ -56,4 +56,4 @@ def values(cls) -> Iterator[Any]:
     @classmethod
     def items(cls) -> Iterator[tuple[str, Any]]:
         for attr in cls:
-            yield attr, getattr(cls, attr)
+            yield attr, getattr(cls, attr)