sardana-nxsrecorder 3.18.0__py3-none-any.whl → 3.19.0__py3-none-any.whl

{sardana_nxsrecorder-3.18.0.dist-info → sardana_nxsrecorder-3.19.0.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.18.0
+Version: 3.19.0
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski
 Author-email: jankotan@gmail.com
 License: GNU GENERAL PUBLIC LICENSE v3
 Keywords: NeXus sardana scan recorder data
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
@@ -248,5 +247,3 @@ The NeXus file recorder uses the following sardana environment variables
 * **SciCatDatasetListFileLocal** *(bool)* - add the hostname to the scicat dataset list file extension, default: ``False``
 * **SciCatAutoGrouping** *(bool)* - group all scans with the measurement name set to the base scan filename, default: ``False``
 * **MetadataScript** *(str)* - a python module file name containing ``main()``  which provides a dictionary with user metadata stored in the INIT mode, default: ``""``
-
-

sardana_nxsrecorder-3.19.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+sardananxsrecorder/__init__.py,sha256=rLcTXm_38KYJIRnRCt1AfVFOQ2GhZpYWKK2oUylp-Pk,896
+sardananxsrecorder/nxsrecorder.py,sha256=uzkFUa_-wU56pNyo_EAp-cV5eC-W4O4psOh9nO-NHKA,50834
+sardana_nxsrecorder-3.19.0.dist-info/METADATA,sha256=MVRRZwJnbuW2_JkreByCSKsrdZY-ogqzfTMXjpzp6L0,7269
+sardana_nxsrecorder-3.19.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+sardana_nxsrecorder-3.19.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
+sardana_nxsrecorder-3.19.0.dist-info/RECORD,,

{sardana_nxsrecorder-3.18.0.dist-info → sardana_nxsrecorder-3.19.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
+Generator: bdist_wheel (0.38.4)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

sardananxsrecorder/__init__.py

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

sardananxsrecorder/nxsrecorder.py

@@ -508,7 +508,7 @@ class NXS_FileRecorder(BaseFileRecorder):
                     self.__nexuswriter_device = None
                     self.warning("Cannot connect to '%s' " % servers[0])
                     if self.__macro:
-                        self.__macro().Wwarning(
+                        self.__macro().warning(
                             "Cannot connect to '%s'" % servers[0])
             else:
                 self.__nexuswriter_device = None
@@ -956,6 +956,14 @@ class NXS_FileRecorder(BaseFileRecorder):
                 if appendentry else ""
             self.__vars["vars"]["scan_id"] = envRec["serialno"]
             self.__vars["vars"]["scan_title"] = envRec["title"]
+            if self.__macro:
+                if hasattr(self.__macro(), "integ_time"):
+                    self.__vars["vars"]["count_time"] = \
+                        self.__macro().integ_time
+                if hasattr(self.__macro(), "nb_points"):
+                    self.__vars["vars"]["npoints"] = \
+                        self.__macro().nb_points
+            self.__vars["vars"]["beamtime_id"] = self.beamtimeid()
             tzone = self.__getConfVar("TimeZone", self.__timezone)
             self.__vars["data"]["start_time"] = \
                 self.__timeToString(envRec['starttime'], tzone)
@@ -970,6 +978,15 @@ class NXS_FileRecorder(BaseFileRecorder):
 
             self.__vars["data"]["serialno"] = envRec["serialno"]
             self.__vars["data"]["scan_title"] = envRec["title"]
+            if self.__macro:
+                if hasattr(self.__macro(), "integ_time"):
+                    self.__vars["data"]["count_time"] = \
+                        self.__macro().integ_time
+                if hasattr(self.__macro(), "nb_points"):
+                    self.__vars["data"]["npoints"] = \
+                        self.__macro().nb_points
+            self.__vars["data"]["beamtime_id"] = \
+                self.__vars["vars"]["beamtime_id"]
 
             if hasattr(self.__nexuswriter_device, 'Init'):
                 self.__command(self.__nexuswriter_device, "Init")
@@ -1020,8 +1037,10 @@ class NXS_FileRecorder(BaseFileRecorder):
                         self.__macro().warning(
                             "NXS_FileRecorder: %s does not exist" % msf)
                 else:
-                    import imp
-                    msm = imp.load_source('', msf)
+                    import importlib.util
+                    spec = importlib.util.spec_from_file_location('', msf)
+                    msm = importlib.util.module_from_spec(spec)
+                    spec.loader.exec_module(msm)
                     ms = msm.main()
                     if not isinstance(ms, dict):
                         self.warning(
@@ -1164,19 +1183,21 @@ class NXS_FileRecorder(BaseFileRecorder):
                 pass
         return result
 
+    def beamtimeid(self):
+        bmtfpath = self.__getEnvVar("BeamtimeFilePath", "/gpfs/current")
+        bmtfprefix = self.__getEnvVar(
+            "BeamtimeFilePrefix", "beamtime-metadata-")
+        bmtfext = self.__getEnvVar("BeamtimeFileExt", ".json")
+        beamtimeid = self.beamtime_id(bmtfpath, bmtfprefix, bmtfext)
+        return beamtimeid or "00000000"
+
     def __appendSciCatDataset(self, hostname=None):
         """ append dataset to SciCat ingestion list """
 
         fdir, fname = os.path.split(self.filename)
         _, bfname = os.path.split(self.__base_filename)
         sname, fext = os.path.splitext(fname)
-
-        bmtfpath = self.__getEnvVar("BeamtimeFilePath", "/gpfs/current")
-        bmtfprefix = self.__getEnvVar(
-            "BeamtimeFilePrefix", "beamtime-metadata-")
-        bmtfext = self.__getEnvVar("BeamtimeFileExt", ".json")
-        beamtimeid = self.beamtime_id(bmtfpath, bmtfprefix, bmtfext)
-        beamtimeid = beamtimeid or "00000000"
+        beamtimeid = self.beamtimeid()
         defprefix = "scicat-datasets-"
         defaulthost = self.__getEnvVar("SciCatDatasetListFileLocal", None)
         if defaulthost:
@@ -1201,7 +1222,7 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         if appendentry is True:
             sid = self.__getEnvVar("ScanID", 0)
-            sname = "%s::/%s%05i;%s_%05i" % (
+            sname = "%s::/%s%i;%s_%05i" % (
                 scanname, entryname, sid, scanname, sid)
 
         # auto grouping

sardana_nxsrecorder-3.18.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-sardananxsrecorder/__init__.py,sha256=vvqGk7lQt5kOZdF1vRWXKQFWI94Ex8pLzFFAVGC81go,896
-sardananxsrecorder/nxsrecorder.py,sha256=zyJV_rKVCqdpe9QGauNPHOBtjcN8ogqESHXE9WXneeY,49749
-sardana_nxsrecorder-3.18.0.dist-info/METADATA,sha256=ezc1RTlzgQIjSwIPUgqOoxBjR4cwDvipR_3ZS-BVee0,7289
-sardana_nxsrecorder-3.18.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-sardana_nxsrecorder-3.18.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
-sardana_nxsrecorder-3.18.0.dist-info/RECORD,,