sardana-nxsrecorder 3.17.0__tar.gz → 3.17.2__tar.gz

{sardana-nxsrecorder-3.17.0 → sardana-nxsrecorder-3.17.2}/ChangeLog

@@ -1,3 +1,11 @@
+2023-12-13 Jan Kotanski <jankotan@gmail.com>
+	* reduce a number of error messages for wrong user data (#86)
+	* tagged as 3.17.2
+
+2023-12-12 Jan Kotanski <jankotan@gmail.com>
+	* fix typo in in printing error message (#85)
+	* tagged as 3.17.1
+
 2023-12-12 Jan Kotanski <jankotan@gmail.com>
 	* add support for user data units and other attributes (#85)
 	* tagged as 3.17.0

{sardana-nxsrecorder-3.17.0/sardana_nxsrecorder.egg-info → sardana-nxsrecorder-3.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: sardana-nxsrecorder
-Version: 3.17.0
+Version: 3.17.2
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski

{sardana-nxsrecorder-3.17.0 → sardana-nxsrecorder-3.17.2/sardana_nxsrecorder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: sardana-nxsrecorder
-Version: 3.17.0
+Version: 3.17.2
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski

{sardana-nxsrecorder-3.17.0 → sardana-nxsrecorder-3.17.2}/sardananxsrecorder/__init__.py

@@ -20,4 +20,4 @@
 """ Sardana Scan Recorders """
 
 #: package version
-__version__ = "3.17.0"
+__version__ = "3.17.2"

{sardana-nxsrecorder-3.17.0 → sardana-nxsrecorder-3.17.2}/sardananxsrecorder/nxsrecorder.py

@@ -1011,13 +1011,14 @@ class NXS_FileRecorder(BaseFileRecorder):
         if not isinstance(self.__udata, dict):
             if 'MetadataScript' in self.__env.keys():
                 msf = self.__env['MetadataScript']
-            elif 'FioAdditions' in self.__env.keys():
-                msf = self.__env['FioAdditions']
+            # elif 'FioAdditions' in self.__env.keys():
+            #     msf = self.__env['FioAdditions']
             if msf:
                 if not os.path.exists(msf):
                     self.warning("NXS_FileRecorder: %s does not exist" % msf)
-                    self.macro().warning(
-                        "NXS_FileRecorder: %s does not exist" % msf)
+                    if self.__macro:
+                        self.__macro().warning(
+                            "NXS_FileRecorder: %s does not exist" % msf)
                 else:
                     import imp
                     msm = imp.load_source('', msf)
@@ -1025,9 +1026,10 @@ class NXS_FileRecorder(BaseFileRecorder):
                     if not isinstance(ms, dict):
                         self.warning(
                             "NXS_FileRecorder: bad output from %s" % msf)
-                        self.macro().warning(
-                            "NXS_FileRecorder: bad output from %s" % msf)
-                        self.__udata = None
+                        if self.__macro:
+                            self.__macro().warning(
+                                "NXS_FileRecorder: bad output from %s" % msf)
+                        self.__udata = {}
                     else:
                         self.__udata = ms
         if isinstance(self.__udata, dict) and isinstance(ms, dict):