diff --git a/gui/src/aaregui/panels/rotation_data_collection.py b/gui/src/aaregui/panels/rotation_data_collection.py index 7626218a..16c24042 100644 --- a/gui/src/aaregui/panels/rotation_data_collection.py +++ b/gui/src/aaregui/panels/rotation_data_collection.py @@ -1,4 +1,4 @@ -from PySide6.QtCore import Slot, Signal +from PySide6.QtCore import Slot, Signal, Qt from PySide6.QtWidgets import QLabel, QComboBox, QPushButton from aaredaqlib.diffraction_geometry import DiffractionGeometry @@ -23,7 +23,7 @@ class RotationDataCollectionPanel(ScanSettingsPanel): self._filename = "" self.__omega = 0 - + self.__dose_mgy = 0 self._layout.addWidget(QLabel("Start angle", parent=self), 3, 0) self.start_angle = NumberLineEdit(-720, 720.0, 0.0, decimals=3, parent=self) self._layout.addWidget(self.start_angle, 3, 1, 1, 3) @@ -82,10 +82,16 @@ class RotationDataCollectionPanel(ScanSettingsPanel): self._layout.addWidget(self.image_time_enter, 12, 1, 1, 3) self._layout.addWidget(QLabel("s", parent=self), 12, 4) + self._layout.addWidget(QLabel("Dose", parent=self), 13, 0) + self.dose = QLabel(f"{self.__dose_mgy}") + self.dose.setAlignment(Qt.AlignmentFlag.AlignRight) + self._layout.addWidget(self.dose, 13, 1, 1, 3) + self._layout.addWidget(QLabel("MGy", parent=self), 13, 4) + self.measurement_button = QPushButton("Run rotation") self.measurement_button.setStyleSheet("color: rgb(78, 154, 6);") self.measurement_button.clicked.connect(self.run_measurement) - self._layout.addWidget(self.measurement_button, 13, 0, 1, 6) + self._layout.addWidget(self.measurement_button, 14, 0, 1, 6) @Slot() def run_screening(self): @@ -104,18 +110,10 @@ class RotationDataCollectionPanel(ScanSettingsPanel): @Slot() def run_measurement(self): - total_angle = self.total_angle.value - image_angle = self.image_angle.value - if total_angle <= 0 or total_angle < image_angle: - print("Total angle is not valid.") - return - - image_number = round(total_angle / image_angle) - r = RotationScanRequest( file_prefix=self._filename, start_omega_deg=self.start_angle.value, - steps=image_number, + steps=self.image_number(), incr_omega_deg=self.image_angle.value, dtz=self._dtz, transmission=self._transmission, @@ -123,6 +121,15 @@ class RotationDataCollectionPanel(ScanSettingsPanel): exp_time_s=self.image_time_enter.value) self.rotation_scan.emit(r) + def image_number(self): + total_angle = self.total_angle.value + image_angle = self.image_angle.value + if total_angle <= 0 or total_angle < image_angle: + print("Total angle is not valid.") + return 0 + + return round(total_angle / image_angle) + @Slot(str) def update_filename(self, filename: str): self._filename = filename @@ -130,6 +137,13 @@ class RotationDataCollectionPanel(ScanSettingsPanel): @Slot(DAQStatusModel) def update_daq_status(self, s: DAQStatusModel): self.__omega = s.geom.omega_deg + lambda_a = s.diffraction.wavelength_angstrom + kdose = 2000 / (lambda_a * lambda_a) + beam_area = s.geom.beam_size_mm.x * s.geom.beam_size_mm.y * 1e6 + time = self.image_number() * self.image_time_enter.value + + self.__dose_mgy = time * s.bl.flux_ph_s / (beam_area * kdose) + self.dose.setText(f"{(self.__dose_mgy / 1e6):.1f}") @Slot() def update_omega_start(self):