BEC compliance suggestions from Christian
This commit is contained in:
@@ -181,6 +181,9 @@ class aa1AxisDriveDataCollection(PSIDeviceBase):
|
||||
|
||||
Note: bluesky expects a generator, while BEC expects a direct return
|
||||
"""
|
||||
# FIXME: check out the _send_data_to_bec method
|
||||
# FIXME : For constant streaming, chck the pandabox branch
|
||||
# Complete will be called for cleanup so this can go there
|
||||
self._collect(0).wait()
|
||||
self._collect(1).wait()
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ import os
|
||||
import time
|
||||
|
||||
from bec_lib import bec_logger
|
||||
from bec_server.scan_server.scans import AsyncFlyScanBase, ScanBase
|
||||
from bec_server.scan_server.scans import AsyncFlyScanBase, ScanBase, ScanArgType
|
||||
|
||||
logger = bec_logger.logger
|
||||
|
||||
@@ -60,6 +60,7 @@ class TomcatStepScan(ScanBase):
|
||||
):
|
||||
# Converting generic kwargs to tomcat device configuration parameters
|
||||
# Used by gigafrost
|
||||
# FIXME: This should go to the device (maybe use the scanargs to identify itself)
|
||||
kwargs["parameter"]["kwargs"]["exposure_time_ms"] = 1000 * exp_time
|
||||
kwargs["parameter"]["kwargs"]["exposure_period_ms"] = 2 * 1000 * exp_time
|
||||
kwargs["parameter"]["kwargs"]["exposure_num_burst"] = exp_burst
|
||||
@@ -93,7 +94,7 @@ class TomcatStepScan(ScanBase):
|
||||
"""Pre-calculate scan positions"""
|
||||
for ii in range(self.scan_steps + 1):
|
||||
self.positions.append(self.scan_start + ii * self.scan_stepsize)
|
||||
|
||||
# FIXME : override at_each_point
|
||||
|
||||
class TomcatSnapNStep(AsyncFlyScanBase):
|
||||
"""Simple software step scan forTomcat
|
||||
@@ -107,6 +108,9 @@ class TomcatSnapNStep(AsyncFlyScanBase):
|
||||
"""
|
||||
|
||||
scan_name = "tomcatsnapnstepscan"
|
||||
arg_input = {"camera" : ScanArgType.DEVICE,
|
||||
"exp_time" : ScanArgType.FLOAT}
|
||||
arg_bundle_size= {"bundle": len(arg_input), "min": 1, "max": None}
|
||||
required_kwargs = ["scan_start", "scan_end", "steps"]
|
||||
gui_config = {
|
||||
"Movement parameters": ["steps"],
|
||||
@@ -121,12 +125,12 @@ class TomcatSnapNStep(AsyncFlyScanBase):
|
||||
scan_start: float,
|
||||
scan_end: float,
|
||||
steps: int,
|
||||
exp_time=0.005,
|
||||
settling_time=0.2,
|
||||
exp_burst=1,
|
||||
roix=2016,
|
||||
roiy=2016,
|
||||
sync="event",
|
||||
exp_time:float=0.005,
|
||||
settling_time:float=0.2,
|
||||
exp_burst:int=1,
|
||||
roix:int=2016,
|
||||
roiy:int=2016,
|
||||
sync:str="event",
|
||||
**kwargs,
|
||||
):
|
||||
# Converting generic kwargs to tomcat device configuration parameters
|
||||
|
||||
Reference in New Issue
Block a user