From 443ed7aaca9efd34b0fb1fbd8a0ee3e85a7afed1 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 23 Jun 2025 15:36:05 +0200 Subject: [PATCH] GUI: Fix run number for raster --- gui/src/aaregui/panels/file_path_panel.py | 1 + gui/src/aaregui/panels/raster_data_collection.py | 2 +- gui/src/aaregui/scan_logic/raster_grid_manager.py | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gui/src/aaregui/panels/file_path_panel.py b/gui/src/aaregui/panels/file_path_panel.py index ebf9e287..e98229c8 100644 --- a/gui/src/aaregui/panels/file_path_panel.py +++ b/gui/src/aaregui/panels/file_path_panel.py @@ -1,3 +1,4 @@ +import copy from datetime import datetime from PySide6.QtCore import Signal, Slot, Qt diff --git a/gui/src/aaregui/panels/raster_data_collection.py b/gui/src/aaregui/panels/raster_data_collection.py index 7ca55335..b3a89271 100644 --- a/gui/src/aaregui/panels/raster_data_collection.py +++ b/gui/src/aaregui/panels/raster_data_collection.py @@ -78,9 +78,9 @@ class RasterDataCollectionPanel(ScanSettingsPanel): self.metric_combo = QComboBox() self._layout.addWidget(QLabel("Metric", parent=self), 7, 0) - self.metric_combo.addItem("Background estimate", RasterGridMetric.BKG) self.metric_combo.addItem("Spot count", RasterGridMetric.SPOTS) self.metric_combo.addItem("Spot count (res > 5A)", RasterGridMetric.SPOTS_LOW_RES) + self.metric_combo.addItem("Background estimate", RasterGridMetric.BKG) self.metric_combo.addItem("Indexing result", RasterGridMetric.INDEXING) self.metric_combo.addItem("Mosaicity", RasterGridMetric.MOS) self.metric_combo.addItem("B-factor", RasterGridMetric.BFACTOR) diff --git a/gui/src/aaregui/scan_logic/raster_grid_manager.py b/gui/src/aaregui/scan_logic/raster_grid_manager.py index cdf142d1..cce8a2d3 100644 --- a/gui/src/aaregui/scan_logic/raster_grid_manager.py +++ b/gui/src/aaregui/scan_logic/raster_grid_manager.py @@ -1,3 +1,4 @@ +import copy import math from enum import Enum @@ -80,7 +81,7 @@ class RasterGridManager(QObject): self.__geom = geom - self.__metric = RasterGridMetric.BKG + self.__metric = RasterGridMetric.SPOTS self.__loaded_image_prefix = None self.__loaded_image_index = None @@ -90,9 +91,9 @@ class RasterGridManager(QObject): n_x= 0, n_y= 0, smargon = self.__geom.smargon, - grid_size_mm=Coordinate(x=0.01, y=0.01), + grid_size_mm=Coordinate(x=0.02, y=0.02), omega_deg=self.__geom.omega_deg, - exp_time_s=0.01, + exp_time_s=0.02, transmission=1.0, dtz=120.0 ) @@ -268,7 +269,8 @@ class RasterGridManager(QObject): @Slot() def run_grid_scan(self): - self.grid_scan.emit(self.__active_grid) + grid = copy.deepcopy(self.__active_grid) + self.grid_scan.emit(grid) @Slot() def grid_scan_completed(self, r: CompletedRasterGrid):