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

updated channel loading; switched from Phil's to default channels; enabled all GUI panels

Browse Source
This commit is contained in:
augustin_s
2021-09-01 11:47:54 +02:00
parent a2a80e7b33
commit 35d6903973
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
alvra.py
View File

@ -4,7 +4,10 @@ from slic.core.acquisition import SFAcquisition
#from slic.core.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition, SFAcquisition #from slic.core.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition, SFAcquisition
#from slic.core.acquisition.bschannels import BSChannels #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 from slic.core.acquisition import BSChannels
from slic.core.acquisition import PVChannels
from slic.utils.channels import load_channels
from slic.utils import 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
@ -34,9 +37,19 @@ fn_channels = "/sf/alvra/config/com/channel_lists/default_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_pvs = "/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 = BSChannels.from_file(fn_channels)
detectors = Channels(fn_detectors) detectors = load_channels(fn_detectors)
pvs = Channels(fn_pvs) pvs = PVChannels.from_file(fn_pvs)
## For Phil:
#fn_channels = "/sf/alvra/config/com/channel_lists/laser_channel_list_BS"
#fn_pvs = "/sf/alvra/config/com/channel_lists/laser_channel_list_PV"
#
#channels = Channels(fn_channels)
#detectors = None
#pvs = Channels(fn_pvs)
detectors_disable_modules = { detectors_disable_modules = {
"JF02T09V02": { "JF02T09V02": {
@ -56,7 +69,7 @@ scan = Scanner(
condition=check_intensity, condition=check_intensity,
) )
gui = GUI(scan) gui = GUI(scan, show_spec=True, show_goto=True)
bsdaqJF = Deprecator("bsdaqJF", "daq") bsdaqJF = Deprecator("bsdaqJF", "daq")
@ -72,6 +85,3 @@ scansJF = Deprecator("scansJF", "scan")
# scan_info_dir="./", # scan_info_dir="./",
# default_acquisitions=[daqBS], # default_acquisitions=[daqBS],
#) #)