From 8bc49185cbe6c7cd5ddc96128af8dd9e283c4173 Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Fri, 19 Jul 2024 10:10:59 +0200 Subject: [PATCH] allow to start the tango server when MacroServer is down --- ChangeLog | 4 ++++ nxsrecconfig/Release.py | 2 +- nxsrecconfig/Settings.py | 16 ++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7d1c61..a958379 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2024-07-19 Jan Kotanski + * allow to start the tango server when MacroServer is down (#131) + * tagged as v3.40.1 + 2024-01-25 Jan Kotanski * dynamic components for all motors when WritePoolMotorPositions (#128) * tagged as v3.40.0 diff --git a/nxsrecconfig/Release.py b/nxsrecconfig/Release.py index 7aa0c2b..4ea899f 100644 --- a/nxsrecconfig/Release.py +++ b/nxsrecconfig/Release.py @@ -20,4 +20,4 @@ """ NeXus Sardana Recorder Settings - Release """ #: (:obj:`str`) package version -__version__ = "3.40.0" +__version__ = "3.40.1" diff --git a/nxsrecconfig/Settings.py b/nxsrecconfig/Settings.py index 848b016..cfb0d62 100644 --- a/nxsrecconfig/Settings.py +++ b/nxsrecconfig/Settings.py @@ -164,15 +164,15 @@ def __setupSelection(self): """ if not self.__server: self.fetchProfile() - ms = self.__selector.getMacroServer() - amntgrp = MSUtils.getEnv('ActiveMntGrp', ms) - if amntgrp: - self.__selector["MntGrp"] = amntgrp - else: - avsel = self.availableProfiles() - if avsel and avsel[0]: - self.__selector["MntGrp"] = avsel[0] try: + ms = self.__selector.getMacroServer() + amntgrp = MSUtils.getEnv('ActiveMntGrp', ms) + if amntgrp: + self.__selector["MntGrp"] = amntgrp + else: + avsel = self.availableProfiles() + if avsel and avsel[0]: + self.__selector["MntGrp"] = avsel[0] self.fetchProfile() except Exception: import sys