mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

DAQ: Always add "raster/" for rasters (remove {type} in GUI)

Browse Source
This commit is contained in:
leonarski_f
2025-07-15 09:57:17 +02:00
parent de4b94bc93
commit cac3b67dde
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daq/src/mxlibs3/jfjoch.py
+2 -2
View File
@@ -120,8 +120,8 @@ class JFJochWrapper:
experiment_group=pgroup,
transmission=s.bl.transmission,
ring_current_mA=s.bl.ring_current_mA,
sample_temperature_K=s.bl.cryojet_K
#total_flux=s.bl.flux_ph_s
sample_temperature_K=s.bl.cryojet_K,
total_flux=s.bl.flux_ph_s
)
self.__api.start_post(dataset_settings=dataset_settings)
gui/src/aaregui/panels/data_collection_settings.py
+2 -2
View File
@@ -56,8 +56,8 @@ class DataCollectionSettings(QFrame):
raster_mgr.update_filename(self.file_path_panel.filename)
self.screening.update_filename(self.file_path_panel.filename)
self.file_path_panel.raster_path_updated.connect(raster_mgr.update_filename)
self.file_path_panel.meas_path_updated.connect(self.screening.update_filename)
self.file_path_panel.path_updated.connect(raster_mgr.update_filename)
self.file_path_panel.path_updated.connect(self.screening.update_filename)
self.__sample_id = None
@Slot()
gui/src/aaregui/panels/file_path_panel.py
+10 -11
View File
@@ -7,10 +7,12 @@ from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QLineEdit, QSpinBox,
from aaredaqlib.models import SampleShortInfo
from aaregui.widgets.title_label import TitleLabel
## Logic for filenames:
## 1. Rasters are always placed in raster/ subfolder (managed by DAQ)
class FilePathPanel(QWidget):
raster_path_updated = Signal(str)
meas_path_updated = Signal(str)
path_updated = Signal(str)
def __init__(self, parent=None):
super().__init__(parent)
@@ -27,15 +29,14 @@ class FilePathPanel(QWidget):
grid_layout.addWidget(TitleLabel("Dataset path", self), 0, 0, 1, 2)
grid_layout.addWidget(QLabel("Directory", parent=self), 1, 0)
self.directory_edit = QLineEdit("{type}/{date}/{puck}/{pos}", parent=self)
self.directory_edit = QLineEdit("{date}/{puck}/{pos}", parent=self)
self.directory_edit.setStyleSheet("background-color: rgb(255, 255, 255);")
self.directory_edit.setToolTip("Provide subdirectory for your files. The following macros are allowed: <br/>"
"<b>{date}</b> - date in format yyyymmdd <br/>"
"<b>{puck}</b> - puck name <br/>"
"<b>{pos}</b> - pin position in puck <br/>"
"<b>{sample}</b> - sample name <br/>"
"<b>{sample_id}</b> - sample id <br/>"
"<b>{type}</b> - \"raster\" or \"data\" <br/>"
"<b>{sample_id}</b> - sample id <br/>"
"<b>{prefix}</b> - file prefix value")
grid_layout.addWidget(self.directory_edit, 1, 1)
@@ -94,13 +95,10 @@ class FilePathPanel(QWidget):
self.__filename = self.__filename.replace('{puck}', self.__puck_name)
self.__filename = self.__filename.replace('{pos}', f"{self.__puck_pos:02d}")
self.__filename = self.__filename.replace('{sample_id}', f"{self.__sample_id}")
raster = self.__filename.replace('{type}', 'raster')
self.__filename = self.__filename.replace('{type}', 'data')
self.file_name_label.setText(self.__filename + "_master.h5")
self.file_name_label.setStyleSheet("color: rgb(0, 0, 0);")
self.meas_path_updated.emit(self.__filename)
self.raster_path_updated.emit(raster)
self.path_updated.emit(self.__filename)
@Slot()
def increment_run_number(self):
@@ -141,7 +139,8 @@ class FilePathPanel(QWidget):
self.__puck_name = sample.puck_name
self.__puck_pos = sample.pin
self.run_number_edit.setValue(1)
if sample.aaredb_params is not None and sample.aaredb_params.directory is not None:
self.directory_edit.setText(sample.aaredb_params.directory)
#if sample.aaredb_params is not None and sample.aaredb_params.directory is not None:
# self.directory_edit.setText(sample.aaredb_params.directory)
self.update_filename()