sardana-nxsrecorder 3.25.0__py3-none-any.whl → 3.26.1__py3-none-any.whl

{sardana_nxsrecorder-3.25.0.dist-info → sardana_nxsrecorder-3.26.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.25.0
+Version: 3.26.1
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski
@@ -251,7 +251,7 @@ The NeXus file recorder uses the following sardana environment variables
 * **MetadataScript** *(str)* - a python module file name containing ``main()``  which provides a dictionary with user metadata stored in the INIT mode, default: ``""``
 * **ScicatMeasurements** *(dict)* - a dictionary of  measurement names indexed by ``ScanDir`` and  used by ``scingestor``, default: ``{}``
 * **CreateMeasurementFile** *(bool)* - create a measurement file with its filename releated to ``ScicatMeasurements`` or ``ScanFile``, default: ``False``
-* **NeXusSkipAcquisitionModes** *(list)* - a list of strategy modes for which acquisition is skip
 * **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
   

sardana_nxsrecorder-3.26.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+sardananxsrecorder/__init__.py,sha256=D9XnMblVPsgwwr6BjPz877oQCWyEj1GqmL7nb3JAb70,896
+sardananxsrecorder/nxsrecorder.py,sha256=bS7vevRyLtPgz7zoK2XJid9XCTgdKAeJRZb-QK2Nl5g,58343
+sardana_nxsrecorder-3.26.1.dist-info/METADATA,sha256=Y56-3gdsv1UknXfjr8uyMUPVinvmbEYF_Ev-CqHlzCk,8035
+sardana_nxsrecorder-3.26.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+sardana_nxsrecorder-3.26.1.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
+sardana_nxsrecorder-3.26.1.dist-info/RECORD,,

sardananxsrecorder/__init__.py

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

sardananxsrecorder/nxsrecorder.py

@@ -26,7 +26,6 @@ import sys
 
 import numpy
 import json
-import pytz
 import time
 import weakref
 import socket
@@ -158,8 +157,9 @@ class NXS_FileRecorder(BaseFileRecorder):
         #: (:obj:`dict` <:obj:`str` , :obj:`str`>) NeXus configuration
         self.__conf = {}
 
-        #: (:obj:`list` <:obj:`str`>) skip Acquisition Modes
-        self.skipAcquisitionModes = self.__skipAcquisitionModes()
+        #: (:obj:`list` <:obj:`str`>) acquisition Modes
+        self.writerModes = self.__variableList(
+            "NeXusWriterModes")
 
         #: (:obj:`dict` <:obj:`str` , `any`>) User data
         self.__udata = None
@@ -177,7 +177,8 @@ class NXS_FileRecorder(BaseFileRecorder):
 
     def _serial(self, scanID):
         serial = None
-        if "INIT" in self.skipAcquisitionModes:
+        if "NOINIT" in self.writerModes and \
+           "MESH" in self.writerModes:
             if self.__macro:
                 serial = self.__macro().getEnv('NeXusMeshScanID', None)
         if serial is None:
@@ -188,8 +189,8 @@ class NXS_FileRecorder(BaseFileRecorder):
                     serial = scanID
                 else:
                     serial = scanID + 1
-        if self.skipAcquisitionModes and \
-           "INIT" not in self.skipAcquisitionModes:
+        if "MESH" in self.writerModes and \
+           "NOINIT" not in self.writerModes:
             if self.__macro:
                 self.__macro().setEnv('NeXusMeshScanID', serial)
         return serial
@@ -1012,6 +1013,8 @@ class NXS_FileRecorder(BaseFileRecorder):
             self.__vars["vars"]["serialno"] = ("_%05i" % self.__serial) \
                 if appendscanid else ""
             self.__vars["vars"]["scan_id"] = envRec["serialno"]
+            self.__vars["vars"]["acq_modes"] = \
+                ",".join(self.writerModes or [])
             self.__vars["vars"]["scan_title"] = envRec["title"]
             if self.__macro:
                 if hasattr(self.__macro(), "integ_time"):
@@ -1054,8 +1057,9 @@ class NXS_FileRecorder(BaseFileRecorder):
             # self.debug('START_DATA: %s' % str(envRec))
 
             self.__nexuswriter_device.jsonrecord = rec
-            self.skipAcquisitionModes = self.__skipAcquisitionModes()
-            if "INIT" in self.skipAcquisitionModes:
+            self.writerModes = self.__variableList(
+                "NeXusWriterModes")
+            if "NOINIT" in self.writerModes:
                 self.__nexuswriter_device.skipAcquisition = True
 
             self.__command(self.__nexuswriter_device, "openEntry")
@@ -1144,7 +1148,7 @@ class NXS_FileRecorder(BaseFileRecorder):
             rec = json.dumps(
                 envrecord, cls=NXS_FileRecorder.numpyEncoder)
             self.__nexuswriter_device.jsonrecord = rec
-            if "STEP" in self.skipAcquisitionModes:
+            if "NOSTEP" in self.writerModes:
                 self.__nexuswriter_device.skipAcquisition = True
 
             # self.debug('DATA: {"data":%s}' % json.dumps(
@@ -1170,8 +1174,16 @@ class NXS_FileRecorder(BaseFileRecorder):
         :returns: formatted time string
         :rtype: :obj:`str`
         """
+        fmt = '%Y-%m-%dT%H:%M:%S.%f%z'
         try:
-            tz = pytz.timezone(tzone)
+            if sys.version_info >= (3, 9):
+                import zoneinfo
+                tz = zoneinfo.ZoneInfo(tzone)
+                starttime = mtime.replace(tzinfo=tz)
+            else:
+                import pytz
+                tz = pytz.timezone(tzone)
+                starttime = tz.localize(mtime)
         except Exception:
             self.warning(
                 "Wrong TimeZone. "
@@ -1180,13 +1192,15 @@ class NXS_FileRecorder(BaseFileRecorder):
                 self.__macro().warning(
                     "Wrong TimeZone. "
                     "The time zone set to `%s`" % self.__timezone)
-            tz = pytz.timezone(self.__timezone)
+            if sys.version_info >= (3, 9):
+                import zoneinfo
+                tz = zoneinfo.ZoneInfo(self.__timezone)
+                starttime = mtime.replace(tzinfo=tz)
+            else:
+                import pytz
+                tz = pytz.timezone(self.__timezone)
+                starttime = tz.localize(mtime)
 
-        fmt = '%Y-%m-%dT%H:%M:%S.%f%z'
-        if sys.version_info > (3, 6):
-            starttime = mtime.replace(tzinfo=tz)
-        else:
-            starttime = tz.localize(mtime)
         return str(starttime.strftime(fmt))
 
     def _endRecordList(self, recordlist):
@@ -1214,7 +1228,7 @@ class NXS_FileRecorder(BaseFileRecorder):
             rec = json.dumps(
                 envrecord, cls=NXS_FileRecorder.numpyEncoder)
             self.__nexuswriter_device.jsonrecord = rec
-            if "FINAL" in self.skipAcquisitionModes:
+            if "NOFINAL" in self.writerModes:
                 self.__nexuswriter_device.skipAcquisition = True
             self.__command(self.__nexuswriter_device, "closeEntry")
             self.__command(self.__nexuswriter_device, "closeFile")
@@ -1262,18 +1276,18 @@ class NXS_FileRecorder(BaseFileRecorder):
         beamtimeid = self.beamtime_id(bmtfpath, bmtfprefix, bmtfext)
         return beamtimeid or "00000000"
 
-    def __skipAcquisitionModes(self):
-        """ find skip acquisition modes
+    def __variableList(self, variable='NeXusWriterModes'):
+        """ read variable list
         """
         try:
-            skip_acq = self.__macro().getEnv('NeXusSkipAcquisitionModes')
+            msvar = self.__macro().getEnv(variable)
         except Exception:
-            skip_acq = []
-        if isinstance(skip_acq, str):
-            skip_acq = re.split(r"[-;,.\s]\s*", skip_acq)
-        if skip_acq:
-            self.debug('Skip Acquisition Modes: %s' % str(skip_acq))
-        return skip_acq
+            msvar = []
+        if isinstance(msvar, str):
+            msvar = re.split(r"[-;,.\s]\s*", msvar)
+        if msvar:
+            self.debug('%s: %s' % (variable, str(msvar)))
+        return msvar
 
     def __rawfilename(self, serial):
         """ find scan name
@@ -1364,7 +1378,7 @@ class NXS_FileRecorder(BaseFileRecorder):
             sid = self.__serial
             sname = "%s::/%s_%05i;%s_%05i" % (
                 scanname, entryname, sid, scanname, sid)
-        if "INIT" in self.skipAcquisitionModes:
+        if "NOINIT" in self.writerModes:
             sname = "%s:%s" % (sname, time.time())
 
         # auto grouping

sardana_nxsrecorder-3.25.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-sardananxsrecorder/__init__.py,sha256=67kuI-TJbdi73SVAYYXMypOs3c_Ha1M4xCgUJ9fORYU,896
-sardananxsrecorder/nxsrecorder.py,sha256=8JX1iQdtAytFaeFQ9YsUKWdWOJdEIoCM_QR-kmTxpts,57858
-sardana_nxsrecorder-3.25.0.dist-info/METADATA,sha256=N2EG57BsCdnNnHQgBqMBMpph-ZUI0nTXwkujqrhr05M,7993
-sardana_nxsrecorder-3.25.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-sardana_nxsrecorder-3.25.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
-sardana_nxsrecorder-3.25.0.dist-info/RECORD,,