usov_i-org/bec
1
0
Fork 0
mirror of https://github.com/ivan-usov-org/bec.git synced 2025-04-22 02:20:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(scan_server): fixed inheritance for flyers

Browse Source
This commit is contained in:
wakonig_k 2024-02-23 20:59:32 +01:00
parent 63a8dd814c
commit 5f80220fa2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scan_server/scan_server/scans.py
View File

@ -1028,7 +1028,7 @@ class ContLineScan(ScanBase):
raise ScanAbortion(f"Skipped point {self.pointID + 1}")
class RoundScanFlySim(ScanBase):
class RoundScanFlySim(SyncFlyScanBase):
scan_name = "round_scan_fly"
scan_report_hint = "table"
scan_type = "fly"
@ -1066,6 +1066,10 @@ class RoundScanFlySim(ScanBase):
self.scan_motors = []
self.flyer = list(self.caller_args.keys())[0]
@property
def monitor_sync(self):
return self.flyer
def prepare_positions(self):
self._calculate_positions()
self.num_pos = len(self.positions) * self.burst_at_each_point
@ -1261,7 +1265,7 @@ class TimeScan(ScanBase):
yield from self._at_each_point(ind)
class MonitorScan(ScanBase):
class MonitorScan(SyncFlyScanBase):
scan_name = "monitor_scan"
scan_report_hint = "table"
required_kwargs = ["relative"]
@ -1300,6 +1304,10 @@ class MonitorScan(ScanBase):
self.scan_motors = [self.device]
self.flyer = self.device
@property
def monitor_sync(self):
return self.flyer
def _calculate_positions(self) -> None:
self.positions = np.vstack(tuple(self.caller_args.values())).T.tolist()