Live changes from early July, PX-III

src/aare/gui/panels/file_path_panel.py

@@ -2,6 +2,7 @@ import os
 from datetime import datetime
 from pathlib import Path
 
+from aarecommon.config.beamline import mx_beamline
 from aarecommon.models.models import DAQStatusModel, SampleShortInfo
 from PySide6.QtCore import Qt, Signal, Slot
 from PySide6.QtWidgets import QGridLayout, QLabel, QLineEdit, QMessageBox, QSpinBox, QWidget
@@ -28,6 +29,7 @@ class FilePathPanel(QWidget):
         self.__puck_name = "Manual"
         self.__puck_pos = 0
         self.__curr_pgroup = "p11206"
+        self.__beamline = mx_beamline().value.lower()
 
         self.__filename = ""
         self.__scan_kind = "raster"  # default: "rotation" | "screening" | "raster"
@@ -84,11 +86,14 @@ class FilePathPanel(QWidget):
 
     def _expand_macros(self, base: str, rn: int) -> str:
         name = f"{base}_{rn:03d}"
-        name = name.replace("{date}", self.__formatted_date)
-        name = name.replace("{sample}", self.__sample_name)
-        name = name.replace("{puck}", self.__puck_name)
-        name = name.replace("{pos}", f"{self.__puck_pos:02d}")
-        name = name.replace("{sample_id}", f"{self.__sample_id}")
+        name = name.replace('{date}', self.__formatted_date)
+        name = name.replace('{sample}', self.__sample_name)
+        name = name.replace('{CrystalName}', self.__sample_name)
+        name = name.replace('{puck}', self.__puck_name)
+        name = name.replace('{position}', f"{self.__puck_pos:02d}")
+        name = name.replace('{sample_id}', f"{self.__sample_id}")
+        name = name.replace('{beamline}', f"{self.__beamline}")
+        name = name.replace('{prefix}', f"{self.__puck_name}/{self.__puck_pos:02d}/{self.__sample_name}")
         return name
 
     def _effective_dataset_base(self, base_no_run: str) -> str:

src/aare/gui/panels/local_contact_panel.py

@@ -22,7 +22,7 @@ from PySide6.QtWidgets import (
     QTabWidget,
     QTextEdit,
     QVBoxLayout,
-    QWidget,
+    QWidget, 
 )
 
 from aare.gui.constants import LOGGER_NAME
@@ -333,22 +333,11 @@ class LocalContactPanel(QFrame):
         tools_layout.addWidget(tools)
 
         tools_layout.addWidget(
-            self._make_button(
-                "Load BEC user macros", self._daq.bec_load_user_macros, "Loading BEC user macros."
-            )
-        )
+            self._make_button("Load BEC user macros", self._daq.bec_load_user_macros, "Loading BEC user macros."))
         tools_layout.addWidget(
-            self._make_button(
-                "Show BEC user macros",
-                self._daq.bec_list_all_user_macros,
-                "Listing BEC user macros.",
-            )
-        )
+            self._make_button("Show BEC user macros", self._daq.bec_list_all_user_macros, "Listing BEC user macros."))
         tools_layout.addWidget(
-            self._make_button(
-                "Show BEC position devices", self._daq.bec_list_all_devices, "Listing BEC devices."
-            )
-        )
+            self._make_button("Show BEC position devices", self._daq.bec_list_all_devices, "Listing BEC devices."))
         tools_layout.addWidget(
             self._make_button(
                 "Reinitialise BEC planner/devices",

src/aare/gui/scan_logic/rotation_scan_manager.py

@@ -3,6 +3,7 @@ from aarecommon.models.rotation_scan import CompletedRotationScan
 from PySide6.QtCore import QObject, Signal, Slot
 
 
+
 class RotationScanManager(QObject):
     file_ready = Signal(str, int)
 

src/aare/gui/widgets/message_box.py

@@ -8,7 +8,7 @@ from aare.gui.constants import LOGGER_NAME
 
 logger = setup_logger(LOGGER_NAME)
 
-LOW_CURRENT_THRESHOLD = 100.0
+LOW_CURRENT_THRESHOLD = 360.0
 SNOOZE_SECONDS = 3600.0  # "Don't ask again for 1 hour"