sardana-nxsrecorder 3.28.1__py3-none-any.whl → 3.29.1__py3-none-any.whl

{sardana_nxsrecorder-3.28.1.dist-info → sardana_nxsrecorder-3.29.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.28.1
+Version: 3.29.1
 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
@@ -254,4 +235,14 @@ The NeXus file recorder uses the following sardana environment variables
 * **NeXusWriterProperties** *(dict)* - a dictionary of TangoDataWriter (NXSDataWriter) properties (starting with a small letter)
 * **NeXusMeshScanID** *(int)* - ScanID used for composed scans e.g. mesh scan combined from many linear scans
 * **NeXusWriterModes** *(list)* - a list of strategy modes e.g. ``NOINIT``, ``NOSTEP``, ``NOFINAL``, ``MESH``, ``VDS``  separated by commas
-  
+* **ScanNames** *(bool)* - special mode of using ScanName directories i.e.
+
+  * ``True``: the master file in the ScanName directory,
+
+  * ``False``: the master file in the grouping ScanName directory (e.g. without ScanID),
+
+  * ``None`` (or undefined):  standard mode where the master files are outside the ScanName directory
+
+* **ScanNamesNoGrouping** *(bool)* - do not perform grouping when ``ScanNames`` is ``False``
+* **ScanNamesNoMetadata** *(bool)* - do not perform master file metadata ingestion when ``ScanNames`` is ``False``
+ 

sardana_nxsrecorder-3.29.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+sardananxsrecorder/__init__.py,sha256=aKW8w3ANatKiJmOz1vxJfvTMnZ3EKFl-HMslZY8eAvA,896
+sardananxsrecorder/nxsrecorder.py,sha256=yu0VvbXGDi8JBrIXTFDQdBQjDMOgfOnAfXTx7weBVkA,59898
+sardana_nxsrecorder-3.29.1.dist-info/METADATA,sha256=qVduZUM1e8XM40LuSxPRfyrIXgOXF-6P-3QGb1G9fMA,8116
+sardana_nxsrecorder-3.29.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+sardana_nxsrecorder-3.29.1.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
+sardana_nxsrecorder-3.29.1.dist-info/RECORD,,

sardananxsrecorder/__init__.py

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

sardananxsrecorder/nxsrecorder.py

@@ -1348,6 +1348,8 @@ class NXS_FileRecorder(BaseFileRecorder):
         sid = self.__serial
         fdir, fname = os.path.split(self.filename)
         snmode = self.__getEnvVar("ScanNames", None)
+        nometa = self.__getEnvVar("ScanNamesNoMetadata", False)
+        nogrouping = self.__getEnvVar("ScanNamesNoGrouping", False)
         appendentry = self.__getConfVar("AppendEntry", False)
         pdir = None
         if snmode is not None:
@@ -1400,28 +1402,36 @@ class NXS_FileRecorder(BaseFileRecorder):
             commands = []
             try:
                 sm = dict(self.__getEnvVar('SciCatMeasurements', {}))
+                if not isinstance(sm, dict):
+                    sm = {}
             except Exception:
                 sm = {}
 
             if fdir in sm.keys():
                 cgrp = sm[fdir]
                 if cgrp != scanname:
-                    commands.append("__command__ stop")
-                    commands.append("%s:%s" % (cgrp, time.time()))
-                    commands.append("__command__ start %s" % scanname)
+                    if not nogrouping and not nometa:
+                        commands.append("__command__ stop")
+                        commands.append("%s:%s" % (cgrp, time.time()))
+                        commands.append("__command__ start %s" % scanname)
             else:
-                commands.append("__command__ start %s" % scanname)
-            commands.append(sname)
-            commands.append("__command__ stop")
-            commands.append("%s:%s" % (scanname, time.time()))
-            # commands.append("__command__ start %s" % scanname)
+                if not nogrouping and not nometa:
+                    commands.append("__command__ start %s" % scanname)
+            if not nometa:
+                commands.append(sname)
+            if not nogrouping and not nometa:
+                commands.append("__command__ stop")
+            if not nogrouping:
+                commands.append("%s:%s" % (scanname, time.time()))
             sname = "\n".join(commands)
 
-            sm[fdir] = scanname
+            if not nogrouping and not nometa:
+                sm[fdir] = scanname
             self.__env['SciCatMeasurements'] = sm
 
-        with open(dslfile, "a+") as fl:
-            fl.write("\n%s" % sname)
+        if sname:
+            with open(dslfile, "a+") as fl:
+                fl.write("\n%s" % sname)
 
     def __createMeasurementFile(self):
         """ create measurement file """
@@ -1448,6 +1458,8 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         try:
             sm = dict(self.__getEnvVar('SciCatMeasurements', {}))
+            if not isinstance(sm, dict):
+                sm = {}
         except Exception:
             sm = {}
 

sardana_nxsrecorder-3.28.1.dist-info/RECORD

@@ -1,6 +0,0 @@
-sardananxsrecorder/__init__.py,sha256=6f4z75CSpGzc7npZOYVoYLWrZSskxrwIL3ycegwf0UA,896
-sardananxsrecorder/nxsrecorder.py,sha256=3JCs47ZUFPvRwnAEPEreMigq0M_lswLKNrc2xxmBZFI,59381
-sardana_nxsrecorder-3.28.1.dist-info/METADATA,sha256=fBQs5k_8RAZpE4xqChA2-T_0l1MOmtA7GEec6PlaQXg,8035
-sardana_nxsrecorder-3.28.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-sardana_nxsrecorder-3.28.1.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
-sardana_nxsrecorder-3.28.1.dist-info/RECORD,,