checker -> condition

This commit is contained in:
2020-05-03 15:55:08 +00:00
parent 3c9843402d
commit 9b4a200808

View File

@ -4,7 +4,7 @@ from slic.controls import PV
from slic.daq import BSCounter, DBCounter, DIACounter, PVCounter
from slic.scans import Scanner
from slic.utils import Channels, Config, Elog, Screenshot
from slic.checkers import PVChecker
from slic.condition import PVCondition
from slic.utils import devices
@ -25,7 +25,7 @@ fn_channels = "./slickits/alvra/config/channel_list"
channels = Channels(fn_channels)
check_intensity = PVChecker("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=-100, vmax=300, wait_time=3, required_fraction=0.8)
check_intensity = PVCondition("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=-100, vmax=300, wait_time=3, required_fraction=0.8)
bsdaqJF = DIACounter(cfg.instrument, cfg.pgroup, default_channels=channels)
@ -34,7 +34,7 @@ scansJF = Scanner(
# scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
scan_info_dir="./",
default_counters=[bsdaqJF],
checker=check_intensity,
condition=check_intensity,
)