Compare commits

..

3 Commits

Author SHA1 Message Date
hitz_s 1a20282499 Merge pull request 'fix: update info storage with num_monitored_readouts' (#79) from fix/scan_info_readouts into main
CI for debye_bec / test (push) Successful in 57s
Reviewed-on: #79
2026-06-03 13:15:21 +02:00
wakonig_k 1a6eb5ab90 fix: update info storage with num_monitored_readouts
CI for debye_bec / test (push) Successful in 1m4s
CI for debye_bec / test (pull_request) Successful in 1m1s
2026-06-03 13:10:38 +02:00
hitz_s ea23ab2284 Merge pull request 'fix: mo1_bragg calculator' (#78) from fix-mono-calculator into main
CI for debye_bec / test (push) Successful in 54s
Reviewed-on: #78
2026-06-02 13:25:27 +02:00
2 changed files with 6 additions and 5 deletions
+5 -5
View File
@@ -545,11 +545,11 @@ class Pilatus(PSIDeviceBase, ADBase):
self.cam.array_callbacks.set(1).wait(5) # Enable array callbacks
self.hdf.enable.set(1).wait(5) # Enable HDF5 plugin
# Camera settings
self.cam.num_exposures.set(1, timeout=5).wait()
self.cam.num_images.set(self.n_images, timeout=5).wait()
self.cam.acquire_time.set(detector_exp_time, timeout=5).wait() # let's try this
self.cam.acquire_period.set(exp_time, timeout=5).wait()
self.filter_number.set(0, timeout=5).wait()
self.cam.num_exposures.set(1).wait(5)
self.cam.num_images.set(self.n_images).wait(5)
self.cam.acquire_time.set(detector_exp_time).wait(5) # let's try this
self.cam.acquire_period.set(exp_time).wait(5)
self.filter_number.set(0).wait(5)
# HDF5 settings
logger.debug(
f"Setting HDF5 file path to {file_path} and file name to {file_name}. full_path is {self._full_path}"
+1
View File
@@ -13,6 +13,7 @@ def fetch_scan_info(scan_info: ScanInfo) -> ScanServerScanInfo:
info = scan_info.msg.info
if isinstance(info["positions"], list):
info["positions"] = np.array(info["positions"])
info["num_monitored_readouts"] = scan_info.msg.num_monitored_readouts
try:
msg = ScanServerScanInfo.model_validate(info)
except ValidationError: # This means we have an old scan_info object.