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

adjusted daq and scan logic

Browse Source
This commit is contained in:
augustin_s
2019-12-04 15:16:15 +00:00
parent f3e4f31795
commit e40e6fa03a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
alvra.py
View File

@ -18,7 +18,7 @@ elog = Elog(cfg.elog_url, cfg.screenshot_directory, user=cfg.user, password="sup
screenshot = Screenshot(cfg.screenshot_directory) screenshot = Screenshot(cfg.screenshot_directory)
check_intensity = PVChecker("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=100, vmax=300, wait_time=3) check_intensity = PVChecker("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=-100, vmax=300, wait_time=3)
bsdaqJF = DIA(#TODO: gain and pedestal? bsdaqJF = DIA(#TODO: gain and pedestal?
instrument="alvra", instrument="alvra",
@ -29,7 +29,8 @@ bsdaqJF = DIA(#TODO: gain and pedestal?
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="./",
default_counters=[bsdaqJF], default_counters=[bsdaqJF],
checker=check_intensity, checker=check_intensity,
scan_directories=True scan_directories=True
@ -43,8 +44,10 @@ channels = Channels(fn_channels)
bsdaq = BS(channels, default_file_path="???") bsdaq = BS(channels, default_file_path="???")
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="./",
scan_info_dir="./",
default_counters=[bsdaq], default_counters=[bsdaq],
scan_directories=True scan_directories=True
) )