clean up
This commit is contained in:
58
alvra.py
58
alvra.py
@ -1,9 +1,10 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from slic.core.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition, SFAcquisition
|
||||
from slic.core.acquisition.bschannels import BSChannels
|
||||
from slic.core.acquisition import SFAcquisition
|
||||
#from slic.core.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition, SFAcquisition
|
||||
#from slic.core.acquisition.bschannels import BSChannels
|
||||
from slic.core.scanner import Scanner
|
||||
from slic.utils import Channels, Config, Elog, Screenshot, PV
|
||||
from slic.utils import Channels, Config, Elog, Screenshot
|
||||
from slic.core.condition import PVCondition
|
||||
from slic.gui import GUI
|
||||
|
||||
@ -29,13 +30,13 @@ elog = Elog(cfg.elog_url, cfg.screenshot_directory, user=cfg.user, password="sup
|
||||
screenshot = Screenshot(cfg.screenshot_directory)
|
||||
|
||||
|
||||
fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
|
||||
#fn_channels = "/sf/alvra/config/src/python/slic/alvra/config/channel_list"
|
||||
fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
|
||||
fn_detectors = "/sf/alvra/config/com/detector_lists/default_detector_list"
|
||||
fn_PV = "/sf/alvra/config/com/channel_lists/very_long_channel_list_CA"
|
||||
fn_pvs = "/sf/alvra/config/com/channel_lists/very_long_channel_list_CA"
|
||||
|
||||
channels = Channels(fn_channels)
|
||||
detectors = Channels(fn_detectors)
|
||||
pvs = Channels(fn_PV)
|
||||
pvs = Channels(fn_pvs)
|
||||
|
||||
detectors_disable_modules = {
|
||||
"JF02T09V02": {
|
||||
@ -44,48 +45,33 @@ detectors_disable_modules = {
|
||||
}
|
||||
|
||||
|
||||
## this is probably too clever for its own good:
|
||||
#bschs = BSChannels.from_file("/sf/alvra/config/com/channel_lists/very_long_channel_list")
|
||||
#channels, pvs = bschs.online, bschs.offline
|
||||
|
||||
#channels = Channels("/sf/alvra/config/com/channel_lists/very_long_channel_list_BS")
|
||||
#pvs = Channels("/sf/alvra/config/com/channel_lists/very_long_channel_list_CA")
|
||||
|
||||
check_intensity = PVCondition("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=0, vmax=1500, wait_time=3, required_fraction=0.8)
|
||||
|
||||
bsdaqJF = SFAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors)
|
||||
daq = SFAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors)
|
||||
|
||||
scansJF = Scanner(
|
||||
scan = Scanner(
|
||||
scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
|
||||
# scan_info_dir="./",
|
||||
default_acquisitions=[bsdaqJF],
|
||||
default_acquisitions=[daq],
|
||||
condition=check_intensity,
|
||||
)
|
||||
|
||||
|
||||
bsdaq = BSAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
|
||||
|
||||
scansBSreadLocal = Scanner(
|
||||
# scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
|
||||
scan_info_dir="./",
|
||||
default_acquisitions=[bsdaq],
|
||||
)
|
||||
gui = GUI(scan)
|
||||
|
||||
|
||||
bsdaqDB = DBAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
|
||||
bsdaqPV = PVAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
|
||||
bsdaqJF = Deprecator("bsdaqJF", "daq")
|
||||
scansJF = Deprecator("scansJF", "scan")
|
||||
|
||||
|
||||
gui = GUI(scansJF)
|
||||
#daqBS = BSAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
|
||||
#daqDB = DBAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
|
||||
#daqPV = PVAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
|
||||
|
||||
|
||||
#for k, v in sorted(dict(globals()).items()):
|
||||
# if k.startswith("__"):
|
||||
# continue
|
||||
# print("=" * 50)
|
||||
# print(k + ":")
|
||||
# print("-" * (len(k) + 1))
|
||||
# print(v)
|
||||
#scanBS = Scanner(
|
||||
## scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
|
||||
# scan_info_dir="./",
|
||||
# default_acquisitions=[daqBS],
|
||||
#)
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user