add counttime

nexdatas · May 11, 2024 · bd250a8 · bd250a8
1 parent d86e683
commit bd250a8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/sardananxsrecorder/__init__.py b/sardananxsrecorder/__init__.py
@@ -20,4 +20,4 @@
 """ Sardana Scan Recorders """
 
 #: package version
-__version__ = "3.18.1"
+__version__ = "3.19.0"
diff --git a/sardananxsrecorder/nxsrecorder.py b/sardananxsrecorder/nxsrecorder.py
@@ -508,7 +508,7 @@ def __setNexusDevices(self, onlyconfig=False):
                     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,11 @@ def _startRecordList(self, recordlist):
                 if appendentry else ""
             self.__vars["vars"]["scan_id"] = envRec["serialno"]
             self.__vars["vars"]["scan_title"] = envRec["title"]
+            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 +975,12 @@ def _startRecordList(self, recordlist):
 
             self.__vars["data"]["serialno"] = envRec["serialno"]
             self.__vars["data"]["scan_title"] = envRec["title"]
+            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")
@@ -1164,19 +1175,21 @@ def beamtime_id(self, bmtfpath, bmtfprefix, bmtfext):
                 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: