From b25fba8d3e2ca650e55437f4bf17e01902ab33df Mon Sep 17 00:00:00 2001 From: Mathias Sander Date: Mon, 14 Feb 2022 18:44:10 +0100 Subject: [PATCH] runtable added evrs --- eco/bernina/bernina.py | 24 ++++++++++++------------ eco/bernina/config.py | 18 ------------------ eco/utilities/runtable.py | 24 ++++++++++++++---------- 3 files changed, 26 insertions(+), 40 deletions(-) diff --git a/eco/bernina/bernina.py b/eco/bernina/bernina.py index fe455ff..6f2592a 100644 --- a/eco/bernina/bernina.py +++ b/eco/bernina/bernina.py @@ -339,15 +339,15 @@ namespace.append_obj( fina_hex_angle_offset="~/eco/reference_values/hex_pi_angle_offset.json", lazy=True, ) -namespace.append_obj( - "XRDYou", - module_name="eco.endstations.bernina_diffractometers", - Id="SARES21-XRD", - configuration=config_berninamesp["xrd_config"], - diff_detector={"jf_id": "JF01T03V01"}, - name="xrd", - lazy=True, -) +#namespace.append_obj( +# "XRDYou", +# module_name="eco.endstations.bernina_diffractometers", +# Id="SARES21-XRD", +# configuration=config_berninamesp["xrd_config"], +# diff_detector={"jf_id": "JF01T03V01"}, +# name="xrd", +# lazy=True, +#) namespace.append_obj( "KBMirrorBernina_new", "SAROP21-OKBV139", @@ -494,9 +494,9 @@ def _message_end_scan(scan): e.stop() callbacks_start_scan = [] -#callbacks_start_scan = [lambda scan: namespace.init_all()] -#callbacks_start_scan.append(_append_namespace_aliases_to_scan) -#callbacks_start_scan.append(_append_namesace_status_to_scan) +callbacks_start_scan = [lambda scan: namespace.init_all()] +callbacks_start_scan.append(_append_namespace_aliases_to_scan) +callbacks_start_scan.append(_append_namesace_status_to_scan) callbacks_end_scan = [_message_end_scan] diff --git a/eco/bernina/config.py b/eco/bernina/config.py index b1daa55..0882fae 100755 --- a/eco/bernina/config.py +++ b/eco/bernina/config.py @@ -205,24 +205,6 @@ components = [ "desc": "Profile monitor after Mirror 1", "type": "eco.xdiagnostics.profile_monitors:Pprm", }, - { - "name": "mirr1", - "args": [], - "kwargs": {}, - "z_und": 92, - "desc": "Vertical offset mirror 1", - "type": "eco.xoptics.offsetMirrors:OffsetMirror", - "kwargs": {"Id": "SAROP21-OOMV092"}, - }, - { - "name": "mirr2", - "args": [], - "kwargs": {}, - "z_und": 96, - "desc": "Vertical offset mirror 2", - "type": "eco.xoptics.offsetMirrors:OffsetMirror", - "kwargs": {"Id": "SAROP21-OOMV096"}, - }, { "name": "offset", "args": [], diff --git a/eco/utilities/runtable.py b/eco/utilities/runtable.py index 29be090..e0ef740 100644 --- a/eco/utilities/runtable.py +++ b/eco/utilities/runtable.py @@ -1011,9 +1011,9 @@ class Run_Table_DataFrame(DataFrame): self.bad_adjustables = {} ###parsing options - self._parse_exclude_keys = "status_indicators settings_collection status_indicators_collection presets memory _elog _currentChange _flags __ alias namespace daq scan evr _motor Alias".split(" ") - self._parse_exclude_class_types = ("__ alias namespace daq scan evr _motor Alias AdjustablePv AxisPTZ".split(" ")) - self._adj_exclude_class_types = ("__ alias namespace daq scan evr _motor Alias".split(" ")) + self._parse_exclude_keys = "status_indicators settings_collection status_indicators_collection presets memory _elog _currentChange _flags __ alias namespace daq scan MasterEventSystem _motor Alias".split(" ") + self._parse_exclude_class_types = ("__ alias namespace daq scan MasterEventSystem _motor Alias AdjustablePv AxisPTZ".split(" ")) + self._adj_exclude_class_types = ("__ alias namespace daq scan MasterEventSystem _motor Alias".split(" ")) self.key_order = "metadata xrd midir env_thc temperature1_rbk temperature2_rbk time name gps gps_hex thc ocb eos las lxt phase_shifter mono att att_fe slit_und slit_switch slit_att slit_kb slit_cleanup pulse_id mono_energy_rbk att_transmission att_fe_transmission" pd.options.display.max_rows = 100 pd.options.display.max_columns = 50 @@ -1196,7 +1196,7 @@ class Run_Table_DataFrame(DataFrame): self, parent_class, adj_prefix=None, parent_name=None ): if parent_name is None: - parent_name = parent_class.name + parent_name = own_name self._get_all_adjustables_fewerparents(parent_class, adj_prefix, parent_name) if parent_name is not parent_class.name: if adj_prefix is not None: @@ -1205,23 +1205,27 @@ class Run_Table_DataFrame(DataFrame): adj_prefix = parent_class.name sub_classes = [] + sub_classnames = [] for key in parent_class.__dict__.keys(): if ~np.any([s in key for s in self._parse_exclude_keys]): s_class = parent_class.__dict__[key] + if np.all( [ - hasattr(s_class, "__dict__"), hasattr(s_class, "name"), + hasattr(s_class, "__dict__"), s_class.__hash__ is not None, - "eco" in str(type(s_class)), + "eco" in str(s_class.__class__), ~np.any( [ - s in str(type(s_class)) + s in str(s_class.__class__) for s in self._parse_exclude_class_types ] ), ] ): + if s_class.name == None: + s_class.name = key sub_classes.append(s_class) return set(sub_classes).union( [ @@ -1244,17 +1248,17 @@ class Run_Table_DataFrame(DataFrame): [ hasattr(s_class, "__dict__"), s_class.__hash__ is not None, - "eco" in str(type(s_class)), + "eco" in str(s_class.__class__), ~np.any( [ - s in str(type(s_class)) + s in str(s_class.__class__) for s in self._parse_exclude_class_types ] ), ] ): self.adjustables[key] = {} - self._parse_child_instances_fewerparents(s_class) + self._parse_child_instances_fewerparents(s_class, parent_name = key) except Exception as e: print(e) print(key)