diff --git a/daq/src/mxlibs3/jfjoch.py b/daq/src/mxlibs3/jfjoch.py index 993b4d8f..47d0f0c8 100644 --- a/daq/src/mxlibs3/jfjoch.py +++ b/daq/src/mxlibs3/jfjoch.py @@ -121,7 +121,9 @@ class JFJochWrapper: 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 + total_flux=s.bl.flux_ph_s, + space_group_number=1 + #TODO space_group_number and unit_cell??? ) self.__api.start_post(dataset_settings=dataset_settings) diff --git a/gui/src/aaregui/panels/raster_data_collection.py b/gui/src/aaregui/panels/raster_data_collection.py index 8da2b2e9..e90c9f16 100644 --- a/gui/src/aaregui/panels/raster_data_collection.py +++ b/gui/src/aaregui/panels/raster_data_collection.py @@ -86,7 +86,7 @@ class RasterDataCollectionPanel(ScanSettingsPanel): self.metric_combo.addItem("Spot ratio (ice/low res.)", RasterGridMetric.SPOTS_ICE_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("Profile Radius", RasterGridMetric.PR) self.metric_combo.addItem("B-factor", RasterGridMetric.BFACTOR) self.metric_combo.addItem("Resolution (ML est.)", RasterGridMetric.RES) diff --git a/gui/src/aaregui/scan_logic/raster_grid_manager.py b/gui/src/aaregui/scan_logic/raster_grid_manager.py index 90d8037d..7277f927 100644 --- a/gui/src/aaregui/scan_logic/raster_grid_manager.py +++ b/gui/src/aaregui/scan_logic/raster_grid_manager.py @@ -17,7 +17,7 @@ class RasterGridMetric(Enum): BKG = 0 SPOTS = 1 INDEXING = 2 - MOS = 3 + PR = 3 BFACTOR = 4 SPOTS_LOW_RES = 5 RES = 6 @@ -285,8 +285,8 @@ class RasterGridManager(QObject): if grid.result.images[cell].b is not None and grid.result.images[cell].b >= 0: txt += f"B-factor {grid.result.images[cell].b:.2f}
" - if grid.result.images[cell].mos is not None and grid.result.images[cell].mos >= 0: - txt += f"Mosaicity {grid.result.images[cell].mos:.2f}" + if grid.result.images[cell].pr is not None and grid.result.images[cell].pr >= 0: + txt += f"Profile Radius {grid.result.images[cell].pr:.2f}" return txt return None @@ -336,8 +336,8 @@ class RasterGridManager(QObject): v = [obj.spots for obj in i.result.images] case RasterGridMetric.INDEXING: v = [obj.index for obj in i.result.images] - case RasterGridMetric.MOS: - v = [obj.mos for obj in i.result.images] + case RasterGridMetric.PR: + v = [obj.pr for obj in i.result.images] case RasterGridMetric.BFACTOR: v = [obj.b for obj in i.result.images] case RasterGridMetric.SPOTS_LOW_RES: diff --git a/gui/src/aaregui/threads/jfjoch_viewer.py b/gui/src/aaregui/threads/jfjoch_viewer.py index 031c3f91..55caaab3 100644 --- a/gui/src/aaregui/threads/jfjoch_viewer.py +++ b/gui/src/aaregui/threads/jfjoch_viewer.py @@ -35,7 +35,8 @@ class JFJochDBusClient(QObject): @Slot(str) def load_file(self, name: str): - path = "/sls/mx/data/" + name + "_master.h5" + #path = "/sls/mx/data/" + name + "_master.h5" + path=name print(f"load {path}") if self._ensure_interface(): reply = self.__interface.call("LoadFile", path, 0, 1) @@ -43,6 +44,8 @@ class JFJochDBusClient(QObject): @Slot(int) def load_image(self, name: str, number: int): path = "/sls/mx/data/" + name + "_master.h5" + #path = "/sls/mx/data/" + name + "_master.h5" + path=name print(f"load {path}") print(f"load image {number}") if self._ensure_interface():