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

clean up

Browse Source
This commit is contained in:
augustin_s
2021-06-18 17:28:05 +02:00
parent f6dbb0419e
commit 0044841cbd
1 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
alvra.py
View File

@ -1,9 +1,10 @@
#!/usr/bin/env python #!/usr/bin/env python
from slic.core.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition, SFAcquisition from slic.core.acquisition import SFAcquisition
from slic.core.acquisition.bschannels import BSChannels #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.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.core.condition import PVCondition
from slic.gui import GUI 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) screenshot = Screenshot(cfg.screenshot_directory)
fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list" fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
#fn_channels = "/sf/alvra/config/src/python/slic/alvra/config/channel_list"
fn_detectors = "/sf/alvra/config/com/detector_lists/default_detector_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) channels = Channels(fn_channels)
detectors = Channels(fn_detectors) detectors = Channels(fn_detectors)
pvs = Channels(fn_PV) pvs = Channels(fn_pvs)
detectors_disable_modules = { detectors_disable_modules = {
"JF02T09V02": { "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) 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="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
# scan_info_dir="./", # scan_info_dir="./",
default_acquisitions=[bsdaqJF], default_acquisitions=[daq],
condition=check_intensity, condition=check_intensity,
) )
gui = GUI(scan)
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],
)
bsdaqDB = DBAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels) bsdaqJF = Deprecator("bsdaqJF", "daq")
bsdaqPV = PVAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels) 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)
#scanBS = Scanner(
#for k, v in sorted(dict(globals()).items()): ## scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
# if k.startswith("__"): # scan_info_dir="./",
# continue # default_acquisitions=[daqBS],
# print("=" * 50) #)
# print(k + ":")
# print("-" * (len(k) + 1))
# print(v)