sardana-nxsrecorder 3.22.0__py3-none-any.whl → 3.24.0__py3-none-any.whl

{sardana_nxsrecorder-3.22.0.dist-info → sardana_nxsrecorder-3.24.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.22.0
+Version: 3.24.0
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski
@@ -236,6 +236,8 @@ The NeXus file recorder uses the following sardana environment variables
 
 * **ActiveMntGrp** *(str)* - active measurement group
 * **ScanID** *(int)* - the last scan identifier number, default: ``-1``
+* **ScanDir** *(str)* - the scan directory
+* **ScanFile** *(list)* - a list of scan files
 * **NeXusSelectorDevice** *(str)* - NXSRecSelector tango device if more installed, otherwise first one found
 
 * **NXSAppendSciCatDataset** *(bool)* - append scan name to scicat dataset list file, default: ``False``
@@ -249,4 +251,6 @@ 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)
   

sardana_nxsrecorder-3.24.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+sardananxsrecorder/__init__.py,sha256=hMiS-40RFpQGJHFLwDY7Sy0gsO6e8bykEjdo-YgNxmY,896
+sardananxsrecorder/nxsrecorder.py,sha256=bVa7W85rxWLvHttxK5zaXZrZRvUka8ZCfHHmT65tbyE,57212
+sardana_nxsrecorder-3.24.0.dist-info/METADATA,sha256=FonANvw1tfIiizSe_R104MF6D8Q5hJj03Y8dgi7035k,7883
+sardana_nxsrecorder-3.24.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+sardana_nxsrecorder-3.24.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
+sardana_nxsrecorder-3.24.0.dist-info/RECORD,,

sardananxsrecorder/__init__.py

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

sardananxsrecorder/nxsrecorder.py

@@ -155,6 +155,9 @@ class NXS_FileRecorder(BaseFileRecorder):
         #: (:obj:`dict` <:obj:`str` , :obj:`str`>) NeXus configuration
         self.__conf = {}
 
+        #: (:obj:`list` <:obj:`str`>) skip Acquisition Modes
+        self.skipAcquisitionModes = []
+
         #: (:obj:`dict` <:obj:`str` , `any`>) User data
         self.__udata = None
 
@@ -540,6 +543,18 @@ class NXS_FileRecorder(BaseFileRecorder):
             if self.__nexuswriter_device is None:
                 from nxswriter import TangoDataWriter
                 self.__nexuswriter_device = TangoDataWriter.TangoDataWriter()
+                try:
+                    properties = dict(
+                        self.__getEnvVar("NeXusWriterProperties", {}))
+                except Exception as e:
+                    self.warning(
+                        "Cannot load NeXusWriterProperties %s" % (str(e)))
+                    self.__macro().warning(
+                        "Cannot load NeXusWriterProperties %s" % (str(e)))
+                    properties = {}
+                for ky, vl in properties.items():
+                    if hasattr(self.__nexuswriter_device, ky):
+                        setattr(self.__nexuswriter_device, ky, vl)
 
     def __get_alias(self, name):
         """ provides a device alias
@@ -1020,6 +1035,10 @@ 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.__nexuswriter_device.skipAcquisition = True
+
             self.__command(self.__nexuswriter_device, "openEntry")
         except Exception:
             self.__removeDynamicComponent()
@@ -1106,6 +1125,8 @@ class NXS_FileRecorder(BaseFileRecorder):
             rec = json.dumps(
                 envrecord, cls=NXS_FileRecorder.numpyEncoder)
             self.__nexuswriter_device.jsonrecord = rec
+            if "STEP" in self.skipAcquisitionModes:
+                self.__nexuswriter_device.skipAcquisition = True
 
             # self.debug('DATA: {"data":%s}' % json.dumps(
             #     record.data,
@@ -1174,6 +1195,8 @@ class NXS_FileRecorder(BaseFileRecorder):
             rec = json.dumps(
                 envrecord, cls=NXS_FileRecorder.numpyEncoder)
             self.__nexuswriter_device.jsonrecord = rec
+            if "FINAL" in self.skipAcquisitionModes:
+                self.__nexuswriter_device.skipAcquisition = True
             self.__command(self.__nexuswriter_device, "closeEntry")
             self.__command(self.__nexuswriter_device, "closeFile")
         except Exception:
@@ -1220,6 +1243,19 @@ class NXS_FileRecorder(BaseFileRecorder):
         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 __rawfilename(self, serial):
         """ find scan name
         """
@@ -1309,6 +1345,8 @@ class NXS_FileRecorder(BaseFileRecorder):
             sid = self.__vars["vars"]["scan_id"]
             sname = "%s::/%s_%05i;%s_%05i" % (
                 scanname, entryname, sid, scanname, sid)
+        if "INIT" in self.skipAcquisitionModes:
+            sname = "%s:%s" % (sname, time.time())
 
         # auto grouping
         grouping = bool(self.__getEnvVar('SciCatAutoGrouping', False))
@@ -1370,7 +1408,6 @@ class NXS_FileRecorder(BaseFileRecorder):
                "{ScanID" not in self.__raw_filename:
                 sname = sname + ("_%05i" % sid)
                 entryname = entryname + ("_%05i" % sid)
-
         mntname = scanname
         if fdir in sm.keys() and sm[fdir]:
             mntname = sm[fdir]

sardana_nxsrecorder-3.22.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-sardananxsrecorder/__init__.py,sha256=gUu5k6aJRyRksDS_IRn8O6fVbNsgLNZVeuowa4MISt4,896
-sardananxsrecorder/nxsrecorder.py,sha256=ypWSER8Y-DiWs8KPf81EBxjYD0LtL5Iw6kJMAXj7j9I,55536
-sardana_nxsrecorder-3.22.0.dist-info/METADATA,sha256=m8tvcIFVtkqFb5RHHpXcicV-UvudHoTUXNaiADVdm3o,7566
-sardana_nxsrecorder-3.22.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-sardana_nxsrecorder-3.22.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
-sardana_nxsrecorder-3.22.0.dist-info/RECORD,,