replace NeXusSkipAcquisitionModes by NeXusAcquisitionModes variable

nexdatas · Jun 10, 2024 · c090008 · c090008
1 parent 15cb11b
commit c090008
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 39 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,6 @@
-2024-06-07 Jan Kotanski <[email protected]>
-	* add NeXusAcquisitionModes variable (#127)
-	* tagged as 3.25.0
+2024-06-19 Jan Kotanski <[email protected]>
+	* replace NeXusSkipAcquisitionModes by NeXusAcquisitionModes variable (#127)
+	* tagged as 3.26.0
 
 2024-06-07 Jan Kotanski <[email protected]>
 	* set NeXusMeshScanID variable (#124)

diff --git a/README.rst b/README.rst
@@ -227,5 +227,4 @@ 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
 * **NeXusAcquisitionModes** *(list)* - a list of strategy modes e.g. ``INIT``, ``NOINIT``, ``NOSTEP``, ``NOFINAL``, ``VDS``  separated by commas
-* **NeXusSkipAcquisitionModes** *(list)* - a list of strategy modes for which acquisition is skip  separated by commas
 
diff --git a/man/sardananxsrecorder.1 b/man/sardananxsrecorder.1
@@ -359,8 +359,6 @@ The NeXus file recorder uses the following sardana environment variables
 \fBNeXusMeshScanID\fP \fI(int)\fP \- ScanID used for composed scans e.g. mesh scan combined from many linear scans
 .IP \(bu 2
 \fBNeXusAcquisitionModes\fP \fI(list)\fP \- a list of strategy modes e.g. \fBINIT\fP, \fBNOINIT\fP, \fBNOSTEP\fP, \fBNOFINAL\fP, \fBVDS\fP  separated by commas
-.IP \(bu 2
-\fBNeXusSkipAcquisitionModes\fP \fI(list)\fP \- a list of strategy modes for which acquisition is skip  separated by commas
 .UNINDENT
 .sp
 Contents:

diff --git a/sardananxsrecorder/nxsrecorder.py b/sardananxsrecorder/nxsrecorder.py
@@ -158,10 +158,6 @@ def __init__(self, filename=None, macro=None, **pars):
         #: (:obj:`dict` <:obj:`str` , :obj:`str`>) NeXus configuration
         self.__conf = {}
 
-        #: (:obj:`list` <:obj:`str`>) skip Acquisition Modes
-        self.skipAcquisitionModes = self.__variableList(
-            "NeXusSkipAcquisitionModes")
-
         #: (:obj:`list` <:obj:`str`>) acquisition Modes
         self.acquisitionModes = self.__variableList(
             "NeXusAcquisitionModes")
@@ -182,8 +178,7 @@ def __init__(self, filename=None, macro=None, **pars):
 
     def _serial(self, scanID):
         serial = None
-        if "INIT" in self.skipAcquisitionModes or \
-           "NOINIT" in self.acquisitionModes:
+        if "NOINIT" in self.acquisitionModes:
             if self.__macro:
                 serial = self.__macro().getEnv('NeXusMeshScanID', None)
         if serial is None:
@@ -194,9 +189,7 @@ def _serial(self, scanID):
                     serial = scanID
                 else:
                     serial = scanID + 1
-        if (self.skipAcquisitionModes and
-                "INIT" not in self.skipAcquisitionModes) or \
-                ("INIT" in self.acquisitionModes):
+        if "INIT" in self.acquisitionModes:
             if self.__macro:
                 self.__macro().setEnv('NeXusMeshScanID', serial)
         return serial
@@ -1019,8 +1012,6 @@ def _startRecordList(self, recordlist):
             self.__vars["vars"]["serialno"] = ("_%05i" % self.__serial) \
                 if appendscanid else ""
             self.__vars["vars"]["scan_id"] = envRec["serialno"]
-            self.__vars["vars"]["skip_acq_modes"] = \
-                ",".join(self.skipAcquisitionModes or [])
             self.__vars["vars"]["acq_modes"] = \
                 ",".join(self.acquisitionModes or [])
             self.__vars["vars"]["scan_title"] = envRec["title"]
@@ -1065,12 +1056,9 @@ def _startRecordList(self, recordlist):
             # self.debug('START_DATA: %s' % str(envRec))
 
             self.__nexuswriter_device.jsonrecord = rec
-            self.skipAcquisitionModes = self.__variableList(
-                "NeXusSkipAcquisitionModed")
             self.acquisitionModes = self.__variableList(
                 "NeXusAcquisitionMode")
-            if "INIT" in self.skipAcquisitionModes or \
-               "NOINIT" in self.acquisitionModes:
+            if "NOINIT" in self.acquisitionModes:
                 self.__nexuswriter_device.skipAcquisition = True
 
             self.__command(self.__nexuswriter_device, "openEntry")
@@ -1159,8 +1147,7 @@ def _writeRecord(self, record):
             rec = json.dumps(
                 envrecord, cls=NXS_FileRecorder.numpyEncoder)
             self.__nexuswriter_device.jsonrecord = rec
-            if "STEP" in self.skipAcquisitionModes or \
-               "NOSTEP" in self.acquisitionModes:
+            if "NOSTEP" in self.acquisitionModes:
                 self.__nexuswriter_device.skipAcquisition = True
 
             # self.debug('DATA: {"data":%s}' % json.dumps(
@@ -1230,8 +1217,7 @@ def _endRecordList(self, recordlist):
             rec = json.dumps(
                 envrecord, cls=NXS_FileRecorder.numpyEncoder)
             self.__nexuswriter_device.jsonrecord = rec
-            if "FINAL" in self.skipAcquisitionModes or \
-               "NOFINAL" in self.acquisitionModes:
+            if "NOFINAL" in self.acquisitionModes:
                 self.__nexuswriter_device.skipAcquisition = True
             self.__command(self.__nexuswriter_device, "closeEntry")
             self.__command(self.__nexuswriter_device, "closeFile")
@@ -1279,19 +1265,6 @@ def beamtimeid(self):
         beamtimeid = self.beamtime_id(bmtfpath, bmtfprefix, bmtfext)
         return beamtimeid or "00000000"
 
-    def __skipAcquisitionModes(self):
-        """ find skip acquisition modes
-        """
-        try:
-            skip_acq = self.__macro().getEnv('NeXusSkipAcquisitionModes')
-        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
-
     def __variableList(self, variable='NeXusAcquisitionModes'):
         """ read variable list
         """
@@ -1394,7 +1367,7 @@ def __appendSciCatDataset(self, hostname=None):
             sid = self.__serial
             sname = "%s::/%s_%05i;%s_%05i" % (
                 scanname, entryname, sid, scanname, sid)
-        if "INIT" in self.skipAcquisitionModes:
+        if "NOINIT" in self.acquisitionModes:
             sname = "%s:%s" % (sname, time.time())
 
         # auto grouping