sardana-nxsrecorder 3.29.0__py3-none-any.whl → 3.30.0__py3-none-any.whl

{sardana_nxsrecorder-3.29.0.dist-info → sardana_nxsrecorder-3.30.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.29.0
+Version: 3.30.0
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski
@@ -76,7 +76,7 @@ Extract sources and run
 
 .. code-block:: console
 
-	  $ python setup.py install
+	  $ python3 setup.py install
 
 and add an *RecorderPath* property of *MacroServer* with its value
 defining the package location, e.g.
@@ -87,7 +87,7 @@ defining the package location, e.g.
 Debian packages
 """""""""""""""
 
-Debian Bookworm, Bullseye, Buster and Ubuntu Lunar, Jammy and Focal packages can be found in the HDRI repository.
+Debian Bookworm, Bullseye, Buster and Ubuntu Oracular, Noble Jammy packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -109,7 +109,7 @@ Finally, for python2.7
 .. code-block:: console
 
 	  $ apt-get update
-	  $ apt-get install python-sardana-nxsrecorder
+	  $ apt-get install python3-sardana-nxsrecorder
 
 and set the RecoderPath property of MacroServer with
 
@@ -117,34 +117,15 @@ and set the RecoderPath property of MacroServer with
 
 	  $ apt-get install sardana-nxsrecorder
 
-For python3
-
-.. code-block:: console
-
-	  $ apt-get update
-	  $ apt-get install python3-sardana-nxsrecorder
-	  $ apt-get install sardana-nxsrecorder3
 
 To instal other NexDaTaS packages
 
-.. code-block:: console
-
-	  $ apt-get install python-nxswriter nxsconfigserver-db python-nxsconfigserver nxsconfigtool python-nxstools nxswriter nxsconfigserver nxsrecselector
-
-or for python 3
-
 .. code-block:: console
 
 	  $ apt-get install python3-nxswriter nxsconfigserver-db python3-nxsconfigserver nxsconfigtool3 python3-nxstools nxswriter3 nxsconfigserver3
 
 and
 
-.. code-block:: console
-
-	  $ apt-get install python-nxsrecselector nxsrecselector nxselector
-
-or for python3
-
 .. code-block:: console
 
 	  $ apt-get install python3-nxsrecselector nxsrecselector3 nxselector3

sardana_nxsrecorder-3.30.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+sardananxsrecorder/__init__.py,sha256=Gi6Nc8XqKBPmq8YhG7H2-9QGIR9lmirdvd-UUbWFOZU,896
+sardananxsrecorder/nxsrecorder.py,sha256=D2upQ6dLwZZQKPgIzUJPROAfDFYJfWBk-T-8cmNpdOU,60716
+sardana_nxsrecorder-3.30.0.dist-info/METADATA,sha256=OyCMdsfpzFGG8CyS2iPvvE6m5vo-HMqvLFfrmnvMQBg,8116
+sardana_nxsrecorder-3.30.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+sardana_nxsrecorder-3.30.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
+sardana_nxsrecorder-3.30.0.dist-info/RECORD,,

sardananxsrecorder/__init__.py

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

sardananxsrecorder/nxsrecorder.py

@@ -600,6 +600,26 @@ class NXS_FileRecorder(BaseFileRecorder):
             alias = None
         return alias
 
+    def __short_name(self, name):
+        """ provides a device alias
+
+        :param name: device name
+        :type name: :obj:`str`
+        :returns: device alias
+        :rtype: :obj:`str`
+        """
+        # if name does not contain a "/" it's probably an alias
+        if name.startswith("tango://"):
+            name = name[8:]
+        if name.find("/") == -1:
+            return name
+
+        # haso107klx:10000/expchan/hasysis3820ctrl/1
+        if name.find(':') >= 0:
+            lst = name.split("/")
+            name = "/".join(lst[1:])
+        return name
+
     def __collectAliases(self, envRec):
         """ sets deviceAlaises and dynamicDataSources from env record
 
@@ -656,6 +676,9 @@ class NXS_FileRecorder(BaseFileRecorder):
         lddict = []
         tdss = [ds for ds in dss if not ds.startswith("tango://")
                 and ds not in nexuscomponents]
+        tgdss = [self.__short_name(ds)
+                 for ds in dss if ds.startswith("tango://")
+                 and ds not in nexuscomponents]
 
         fields = []
         for dd in envRec['datadesc']:
@@ -705,10 +728,13 @@ class NXS_FileRecorder(BaseFileRecorder):
         for mdd in fields.values():
             lddict.append(mdd)
 
+        tdss.extend(tgdss)
         jddict = json.dumps(lddict, cls=NXS_FileRecorder.numpyEncoder)
         jdss = json.dumps(tdss, cls=NXS_FileRecorder.numpyEncoder)
         jkeys = json.dumps(keys, cls=NXS_FileRecorder.numpyEncoder)
-        # self.debug("JDD: %s" % jddict)
+        self.debug("JDD: %s" % jddict)
+        self.debug("JDs: %s" % tdss)
+        self.debug("Jk: %s" % jkeys)
         self.__dynamicCP = \
             self.__command(self.__nexussettings_device,
                            "createDynamicComponent",
@@ -1402,6 +1428,8 @@ class NXS_FileRecorder(BaseFileRecorder):
             commands = []
             try:
                 sm = dict(self.__getEnvVar('SciCatMeasurements', {}))
+                if not isinstance(sm, dict):
+                    sm = {}
             except Exception:
                 sm = {}
 
@@ -1456,6 +1484,8 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         try:
             sm = dict(self.__getEnvVar('SciCatMeasurements', {}))
+            if not isinstance(sm, dict):
+                sm = {}
         except Exception:
             sm = {}
 

sardana_nxsrecorder-3.29.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-sardananxsrecorder/__init__.py,sha256=I4fy63PG6PEO-ccX4KwyaT3_WUwNbwqi2Vg6PQTh0_c,896
-sardananxsrecorder/nxsrecorder.py,sha256=ovQh6Fhh7YTShCpuvsrntFGY2TJxd7V3Nbc-6nrFxBs,59760
-sardana_nxsrecorder-3.29.0.dist-info/METADATA,sha256=19GQGpmlAvFRwpBTBq4lwXOiZ64c_C217F2qHkoA6Tc,8569
-sardana_nxsrecorder-3.29.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-sardana_nxsrecorder-3.29.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
-sardana_nxsrecorder-3.29.0.dist-info/RECORD,,