sardana-nxsrecorder 3.25.0__tar.gz → 3.26.1__tar.gz

{sardana-nxsrecorder-3.25.0 → sardana-nxsrecorder-3.26.1}/ChangeLog

@@ -1,3 +1,11 @@
+2024-07-03 Jan Kotanski <jankotan@gmail.com>
+	* fix for summer time parsing (#132)
+	* tagged as 3.26.1
+
+2024-06-19 Jan Kotanski <jankotan@gmail.com>
+	* replace NeXusSkipAcquisitionModes by NeXusWriterModes variable (#127)
+	* tagged as 3.26.0
+
 2024-06-07 Jan Kotanski <jankotan@gmail.com>
 	* set NeXusMeshScanID variable (#124)
 	* tagged as 3.25.0

{sardana-nxsrecorder-3.25.0/sardana_nxsrecorder.egg-info → sardana-nxsrecorder-3.26.1}/PKG-INFO

@@ -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
@@ -249,7 +249,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.25.0 → sardana-nxsrecorder-3.26.1}/README.rst

@@ -224,7 +224,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.25.0 → sardana-nxsrecorder-3.26.1}/man/sardananxsrecorder.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SARDANANXSRECORDER" "1" "Jun 06, 2024" "3.25" "Sardana NeXus Recorder"
+.TH "SARDANANXSRECORDER" "1" "Jun 11, 2024" "3.26" "Sardana NeXus Recorder"
 .SH NAME
 sardananxsrecorder \- sardananxsrecorder Documentation
 .sp
@@ -354,11 +354,11 @@ The NeXus file recorder uses the following sardana environment variables
 .IP \(bu 2
 \fBCreateMeasurementFile\fP \fI(bool)\fP \- create a measurement file with its filename releated to \fBScicatMeasurements\fP or \fBScanFile\fP, default: \fBFalse\fP
 .IP \(bu 2
-\fBNeXusSkipAcquisitionModes\fP \fI(list)\fP \- a list of strategy modes for which acquisition is skip
-.IP \(bu 2
 \fBNeXusWriterProperties\fP \fI(dict)\fP \- a dictionary of TangoDataWriter (NXSDataWriter) properties (starting with a small letter)
 .IP \(bu 2
 \fBNeXusMeshScanID\fP \fI(int)\fP \- ScanID used for composed scans e.g. mesh scan combined from many linear scans
+.IP \(bu 2
+\fBNeXusWriterModes\fP \fI(list)\fP \- a list of strategy modes e.g. \fBNOINIT\fP, \fBNOSTEP\fP, \fBNOFINAL\fP, \fBMESH\fP, \fBVDS\fP  separated by commas
 .UNINDENT
 .sp
 Contents:

{sardana-nxsrecorder-3.25.0 → sardana-nxsrecorder-3.26.1/sardana_nxsrecorder.egg-info}/PKG-INFO

@@ -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
@@ -249,7 +249,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.25.0 → sardana-nxsrecorder-3.26.1}/sardananxsrecorder/__init__.py

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

{sardana-nxsrecorder-3.25.0 → sardana-nxsrecorder-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