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

re-wrote DIA counter, separated pedestal code (needs work still), also added DB Counter to alvra script

Browse Source
This commit is contained in:
augustin_s
2020-03-22 12:02:29 +00:00
parent 77a4b79ca5
commit 2d80a0e71b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
alvra.py
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 BSCounter, DIACounter from slic.daq import BSCounter, DBCounter, 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
@ -20,13 +20,17 @@ elog = Elog(cfg.elog_url, cfg.screenshot_directory, user=cfg.user, password="sup
screenshot = Screenshot(cfg.screenshot_directory) screenshot = Screenshot(cfg.screenshot_directory)
#fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
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) check_intensity = PVChecker("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=-100, vmax=300, wait_time=3)
bsdaqJF = DIACounter(#TODO: gain and pedestal? bsdaqJF = DIACounter(#TODO: gain and pedestal?
instrument="alvra", instrument="alvra",
api_address="http://sf-daq-alvra:10000", pgroup=cfg.pgroup,
jf_name="JF_4.5M", default_channels=channels
pgroup=cfg.pgroup
) )
scansJF = Scanner( scansJF = Scanner(
@ -39,10 +43,6 @@ scansJF = Scanner(
) )
#fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
fn_channels = "./slickits/alvra/config/channel_list"
channels = Channels(fn_channels)
bsdaq = BSCounter(channels) bsdaq = BSCounter(channels)
scansBSreadLocal = Scanner( scansBSreadLocal = Scanner(
@ -55,6 +55,9 @@ scansBSreadLocal = Scanner(
) )
bsdaqDB = DBCounter(channels)
#TODO: just some generic examples: #TODO: just some generic examples:
from slic.devices.device import Device from slic.devices.device import Device