diff --git a/alvra.py b/alvra.py index 7f0e5d3..efa821b 100755 --- a/alvra.py +++ b/alvra.py @@ -18,7 +18,7 @@ elog = Elog(cfg.elog_url, cfg.screenshot_directory, user=cfg.user, password="sup 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? instrument="alvra", @@ -29,7 +29,8 @@ bsdaqJF = DIA(#TODO: gain and pedestal? scansJF = Scanner( 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], checker=check_intensity, scan_directories=True @@ -43,8 +44,10 @@ channels = Channels(fn_channels) bsdaq = BS(channels, default_file_path="???") scansBSreadLocal = Scanner( - data_base_dir="/sf/alvra/data/{}/res/scan_data".format(cfg.pgroup), - scan_info_dir="/sf/alvra/data/{}/res/scan_info".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), + data_base_dir="./", + scan_info_dir="./", default_counters=[bsdaq], scan_directories=True )