From f5c42bd107e7bf26f4e5ae67da40b47a0377d9a7 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Thu, 7 Jul 2022 12:26:53 +0200 Subject: [PATCH] moved some eco components to bernina repo --- devices.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/devices.py b/devices.py index a828692..6342380 100644 --- a/devices.py +++ b/devices.py @@ -8,7 +8,7 @@ # # Conventions for the type # the call of type will try to pass a kwarg 'name' with the # name of the component, before only calling args and kwargs. -# if arg or kwarg is of type slic.utils.Component (dummy class) +# if arg or kwarg is of type config.Component (dummy class) # this indicates that an earlier initialized object is used # (e.g. from same configuration). from eco_components.config import ( @@ -22,7 +22,6 @@ from eco_components.config import ( _eco_lazy_init = False config = Configuration( -# "/sf/bernina/config/eco/bernina_config_slic.devices.json", name="bernina_config" "./bernina/config/config.json", name="bernina_config" ) @@ -34,7 +33,7 @@ components = [ # 'kwargs': {} # } { - "type": "slic.utils.eco_components.config:append_to_path", + "type": "eco_components.config:append_to_path", "args": config["path_exp"], "name": "path_exp", "kwargs": {}, @@ -393,7 +392,7 @@ components = [ "args": [], "name": "epics_channel_list", "desc": "epics channel list", - "type": "slic.utils.eco_components.config:ChannelList", + "type": "eco_components.config:ChannelList", # "kwargs": {"file_name":"/sf/bernina/config/channel_lists/default_channel_list_epics"}, "kwargs": {"file_name":"./bernina/config/channel_list"}, }, @@ -503,7 +502,7 @@ components = [ "args": [], "name": "default_channel_list", "desc": "Bernina default channels, used in daq", - "type": "slic.utils.eco_components.config:ChannelList", + "type": "eco_components.config:ChannelList", # "kwargs": {"file_name":"/sf/bernina/config/channel_lists/default_channel_list"}, "kwargs": {"file_name":"./bernina/config/channel_list"}, "lazy": False, @@ -512,7 +511,7 @@ components = [ "args": [], "name": "default_channel_list_bs", "desc": "Bernina default bs channels, used by bs_daq", - "type": "slic.utils.eco_components.config:ChannelList", + "type": "eco_components.config:ChannelList", # "kwargs": {"file_name":"/sf/bernina/config/channel_lists/default_channel_list_bs"}, "kwargs": {"file_name":"./bernina/config/channel_list"}, "lazy": False, @@ -521,7 +520,7 @@ components = [ "args": [], "name": "channels_spectrometer_projection", "desc": "", - "type": "slic.utils.eco_components.config:ChannelList", + "type": "eco_components.config:ChannelList", # "kwargs": {"file_name":"/sf/bernina/config/channel_lists/channel_list_PSSS_projection"}, "kwargs": {"file_name":"./bernina/config/channel_list"}, "lazy": False,