[WIP] work on including SEA info
This commit is contained in:
@ -39,7 +39,7 @@ if home not in sys.path:
|
|||||||
# for newer Frappy installations this should be home (= /home/<instrument>)
|
# for newer Frappy installations this should be home (= /home/<instrument>)
|
||||||
# the following line fixes this in case nicos.conf is not yet updated
|
# the following line fixes this in case nicos.conf is not yet updated
|
||||||
sys.path.append(home)
|
sys.path.append(home)
|
||||||
from servicemanager import FrappyManager, SeaManager
|
from servicemanager import FrappyManager
|
||||||
|
|
||||||
|
|
||||||
def cleanup_defunct():
|
def cleanup_defunct():
|
||||||
@ -152,7 +152,7 @@ def frappy(*args, main=None, stick=None, addons=None):
|
|||||||
- addons are not changed when not given
|
- addons are not changed when not given
|
||||||
- frappy(main='<cfg>') # main cfg is changed, but stick is kept
|
- frappy(main='<cfg>') # main cfg is changed, but stick is kept
|
||||||
"""
|
"""
|
||||||
seacfg = SeaManager().guess_frappy_cfg(config.instrument)
|
seacfg = FrappyManager().cfg_from_sea(config.instrument)
|
||||||
if args:
|
if args:
|
||||||
if main is not None:
|
if main is not None:
|
||||||
raise TypeError('got multiple values for main')
|
raise TypeError('got multiple values for main')
|
||||||
|
Reference in New Issue
Block a user