slic/alvra
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scans -> scanner

Browse Source
This commit is contained in:
augustin_s
2020-05-03 18:06:39 +00:00
parent 9b4a200808
commit 34cfa90356
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
alvra.py
View File

@ -1,8 +1,8 @@
#!/usr/bin/env python #!/usr/bin/env python
from slic.controls import PV from slic.controls import PV
from slic.daq import BSCounter, DBCounter, DIACounter, PVCounter from slic.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition
from slic.scans import Scanner from slic.scanner import Scanner
from slic.utils import Channels, Config, Elog, Screenshot from slic.utils import Channels, Config, Elog, Screenshot
from slic.condition import PVCondition from slic.condition import PVCondition
@ -27,30 +27,30 @@ channels = Channels(fn_channels)
check_intensity = PVCondition("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) bsdaqJF = DIAAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
scansJF = Scanner( scansJF = Scanner(
data_base_dir="scan_data", data_base_dir="scan_data",
# scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup), # scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
scan_info_dir="./", scan_info_dir="./",
default_counters=[bsdaqJF], default_acquisitions=[bsdaqJF],
condition=check_intensity, condition=check_intensity,
) )
bsdaq = BSCounter(cfg.instrument, cfg.pgroup, default_channels=channels) bsdaq = BSAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
scansBSreadLocal = Scanner( scansBSreadLocal = Scanner(
# data_base_dir="/sf/alvra/data/{}/res/scan_data".format(cfg.pgroup), # data_base_dir="/sf/alvra/data/{}/res/scan_data".format(cfg.pgroup),
# scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup), # scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
data_base_dir="./", data_base_dir="./",
scan_info_dir="./", scan_info_dir="./",
default_counters=[bsdaq], default_acquisitions=[bsdaq],
) )
bsdaqDB = DBCounter(cfg.instrument, cfg.pgroup, default_channels=channels) bsdaqDB = DBAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
bsdaqPV = PVCounter(cfg.instrument, cfg.pgroup, default_channels=channels) bsdaqPV = PVAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)