DAQ: Fix issues with DAQ status updates
This commit is contained in:
@@ -258,6 +258,7 @@ class MainWindow(QMainWindow):
|
||||
self.daq.update.connect(self.beamline.beam_mark.update_daq_status)
|
||||
self.daq.update.connect(self.sample_logic.update_daq_status)
|
||||
self.daq.update.connect(self.manual_sample_panel.update_daq_status)
|
||||
self.daq.update.connect(self.update_daq_status)
|
||||
|
||||
self.daq.standard_scan_completed.connect(self.rotation.scan_completed)
|
||||
self.daq.automated_scan_done.connect(self.job_list_panel.automated_scan_done)
|
||||
|
||||
@@ -19,10 +19,9 @@ class RasterDataCollectionPanel(ScanSettingsPanel):
|
||||
|
||||
def __init__(self, raster_mgr :RasterGridManager,
|
||||
diffraction: DiffractionGeometry,
|
||||
default_dtz: float = 200.0,
|
||||
default_transmission: float = 1.0,
|
||||
parent=None):
|
||||
super().__init__(diffraction, default_dtz, default_transmission, parent)
|
||||
super().__init__(diffraction, raster_mgr.active_grid.dtz, default_transmission, parent)
|
||||
|
||||
self.__n_x = raster_mgr.active_grid.n_x
|
||||
self.__n_y = raster_mgr.active_grid.n_y
|
||||
|
||||
@@ -136,6 +136,7 @@ class RotationDataCollectionPanel(ScanSettingsPanel):
|
||||
|
||||
@Slot(DAQStatusModel)
|
||||
def update_daq_status(self, s: DAQStatusModel):
|
||||
super().update_daq_status(s)
|
||||
self.__omega = s.geom.omega_deg
|
||||
lambda_a = s.diffraction.wavelength_angstrom
|
||||
kdose = 2000 / (lambda_a * lambda_a)
|
||||
|
||||
Reference in New Issue
Block a user