adjusted alvra script

This commit is contained in:
2020-03-05 12:13:07 +00:00
parent f6ace9608e
commit e75d37de65

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
from slic.controls import PV from slic.controls import PV
from slic.daq import BS, DIA from slic.daq import BSCounter, DIACounter
from slic.scans import Scanner from slic.scans import Scanner
from slic.utils import Channels, Config, Elog, Screenshot from slic.utils import Channels, Config, Elog, Screenshot
from slic.checkers import PVChecker from slic.checkers import PVChecker
@ -22,7 +22,7 @@ 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 = DIACounter(#TODO: gain and pedestal?
instrument="alvra", instrument="alvra",
api_address="http://sf-daq-alvra:10000", api_address="http://sf-daq-alvra:10000",
jf_name="JF_4.5M", jf_name="JF_4.5M",
@ -43,7 +43,7 @@ scansJF = Scanner(
fn_channels = "./slickits/alvra/config/channel_list" fn_channels = "./slickits/alvra/config/channel_list"
channels = Channels(fn_channels) channels = Channels(fn_channels)
bsdaq = BS(channels, default_file_path="???") bsdaq = BSCounter(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),