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

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

@@ -1,3 +1,12 @@
+2024-07-15 Jan Kotanski <jankotan@gmail.com>
+	* fix ScanFileInScanNameDir variable name to ScanNames (#138)
+	* fix support for ScanNames=False mode (#138)
+	* tagged as 3.28.0
+
+2024-07-11 Jan Kotanski <jankotan@gmail.com>
+	* add support for ScanFileInScanNameDir variable (#135)
+	* tagged as 3.27.0
+
 2024-07-03 Jan Kotanski <jankotan@gmail.com>
 	* fix for summer time parsing (#132)
 	* tagged as 3.26.1

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.26.1
+Version: 3.28.0
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski

{sardana-nxsrecorder-3.26.1 → sardana-nxsrecorder-3.28.0}/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 11, 2024" "3.26" "Sardana NeXus Recorder"
+.TH "SARDANANXSRECORDER" "1" "Jul 14, 2024" "3.28" "Sardana NeXus Recorder"
 .SH NAME
 sardananxsrecorder \- sardananxsrecorder Documentation
 .sp
@@ -380,9 +380,9 @@ constructor
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBfilename\fP (\fI\%str\fP) \-\- ScanFile name
+\fBfilename\fP (\fI\%str\fP) – ScanFile name
 .IP \(bu 2
-\fBmacro\fP (\fI\%sardana.macroserver.macro.Macro\fP) \-\- macro object
+\fBmacro\fP (\fI\%sardana.macroserver.macro.Macro\fP) – macro object
 .UNINDENT
 .UNINDENT
 .INDENT 7.0
@@ -394,13 +394,13 @@ adds custom data to configuration variables, i.e. from macros
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBvalue\fP (\fIany\fP) \-\- variable value
+\fBvalue\fP (\fIany\fP) – variable value
 .IP \(bu 2
-\fBname\fP (\fI\%str\fP) \-\- variable name
+\fBname\fP (\fI\%str\fP) – variable name
 .IP \(bu 2
-\fBgroup\fP (\fI\%str\fP) \-\- variable group inside variable dictionary
+\fBgroup\fP (\fI\%str\fP) – variable group inside variable dictionary
 .IP \(bu 2
-\fBremove\fP (\fI\%bool\fP) \-\- if True variable will be removed
+\fBremove\fP (\fI\%bool\fP) – if True variable will be removed
 .UNINDENT
 .UNINDENT
 .UNINDENT
@@ -415,7 +415,7 @@ and closes the nexus file
 .INDENT 7.0
 .TP
 .B Parameters
-\fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) \-\- sardana record list
+\fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) – sardana record list
 .UNINDENT
 .UNINDENT
 .INDENT 7.0
@@ -429,7 +429,7 @@ and records in INIT mode
 .INDENT 7.0
 .TP
 .B Parameters
-\fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) \-\- sardana record list
+\fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) – sardana record list
 .UNINDENT
 .UNINDENT
 .INDENT 7.0
@@ -443,7 +443,7 @@ and records in INIT mode
 .INDENT 7.0
 .TP
 .B Parameters
-\fBrecord\fP (\fBsardana.macroserver.scan.scandata.Record\fP) \-\- sardana record list
+\fBrecord\fP (\fBsardana.macroserver.scan.scandata.Record\fP) – sardana record list
 .UNINDENT
 .UNINDENT
 .INDENT 7.0
@@ -501,12 +501,12 @@ indent level.  An indent level of 0 will only insert newlines.
 None is the most compact representation.
 .sp
 If specified, separators should be an (item_separator, key_separator)
-tuple.  The default is (\(aq, \(aq, \(aq: \(aq) if \fIindent\fP is \fBNone\fP and
-(\(aq,\(aq, \(aq: \(aq) otherwise.  To get the most compact JSON representation,
-you should specify (\(aq,\(aq, \(aq:\(aq) to eliminate whitespace.
+tuple.  The default is (’, ‘, ‘: ‘) if \fIindent\fP is \fBNone\fP and
+(‘,’, ‘: ‘) otherwise.  To get the most compact JSON representation,
+you should specify (‘,’, ‘:’) to eliminate whitespace.
 .sp
 If specified, default is a function that gets called for objects
-that can\(aqt otherwise be serialized.  It should return a JSON encodable
+that can’t otherwise be serialized.  It should return a JSON encodable
 version of the object or raise a \fBTypeError\fP\&.
 .INDENT 7.0
 .TP
@@ -515,7 +515,7 @@ default encoder
 .INDENT 7.0
 .TP
 .B Parameters
-\fBobj\fP (\fI\%object\fP or \fIany\fP) \-\- numpy array object
+\fBobj\fP (\fI\%object\fP or \fIany\fP) – numpy array object
 .UNINDENT
 .UNINDENT
 .UNINDENT

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.26.1
+Version: 3.28.0
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski

{sardana-nxsrecorder-3.26.1 → sardana-nxsrecorder-3.28.0}/sardananxsrecorder/__init__.py

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

{sardana-nxsrecorder-3.26.1 → sardana-nxsrecorder-3.28.0}/sardananxsrecorder/nxsrecorder.py

@@ -1316,11 +1316,13 @@ class NXS_FileRecorder(BaseFileRecorder):
         bfilename = bfilename or self.__base_filename
         return bfilename
 
-    def __scanname(self, serial):
+    def __scanname(self, serial, default=None):
         """ find scan name
         """
         if not self.__raw_filename:
             self.__raw_filename = self.__rawfilename(serial)
+        if default:
+            return default
         bfilename = self.__raw_filename
         _, bfname = os.path.split(bfilename)
         if bfname.endswith(".tmp"):
@@ -1345,6 +1347,14 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         sid = self.__serial
         fdir, fname = os.path.split(self.filename)
+        snmode = self.__getEnvVar("ScanNames", None)
+        appendentry = self.__getConfVar("AppendEntry", False)
+        pdir = None
+        if snmode is not None:
+            if bool(snmode):
+                fdir = os.path.dirname(os.path.abspath(fdir))
+            elif appendentry is False:
+                fdir, pdir = os.path.split(os.path.abspath(fdir))
         sname, fext = os.path.splitext(fname)
         beamtimeid = self.beamtimeid()
         defprefix = "scicat-datasets-"
@@ -1365,7 +1375,7 @@ class NXS_FileRecorder(BaseFileRecorder):
         if isinstance(variables, dict) and "entryname" in variables:
             entryname = variables["entryname"]
 
-        scanname = self.__scanname(sid)
+        scanname = self.__scanname(sid, pdir)
         # _, bfname = os.path.split(self.__base_filename)
         # try:
         #     scanname, _ = os.path.splitext(bfname % "")
@@ -1378,13 +1388,15 @@ class NXS_FileRecorder(BaseFileRecorder):
             sid = self.__serial
             sname = "%s::/%s_%05i;%s_%05i" % (
                 scanname, entryname, sid, scanname, sid)
+        if pdir:
+            sname = "%s/%s" % (pdir, sname)
         if "NOINIT" in self.writerModes:
             sname = "%s:%s" % (sname, time.time())
 
         # auto grouping
         grouping = bool(self.__getEnvVar('SciCatAutoGrouping', False))
 
-        if grouping:
+        if grouping or pdir:
             commands = []
             try:
                 sm = dict(self.__getEnvVar('SciCatMeasurements', {}))
@@ -1416,10 +1428,18 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         sid = self.__serial
         fdir, fname = os.path.split(self.filename)
+        pdir = None
+        snmode = self.__getEnvVar("ScanNames", None)
+        appendentry = self.__getConfVar("AppendEntry", False)
+        if snmode is not None:
+            if bool(snmode):
+                fdir = os.path.dirname(os.path.abspath(fdir))
+            elif appendentry is False:
+                fdir, pdir = os.path.split(os.path.abspath(fdir))
         sname, fext = os.path.splitext(fname)
         # beamtimeid = self.beamtimeid()
 
-        scanname = self.__scanname(sid)
+        scanname = self.__scanname(sid, pdir)
         # _, bfname = os.path.split(self.__base_filename)
         # try:
         #     scanname, _ = os.path.splitext(bfname % "")
@@ -1454,7 +1474,11 @@ class NXS_FileRecorder(BaseFileRecorder):
                 fl = h5writer.open_file(mntfile, readonly=False)
             rt = fl.root()
             if sname not in rt.names():
-                h5writer.link("%s:/%s" % (fname, entryname), rt, sname)
+                if pdir:
+                    h5writer.link("%s/%s:/%s" %
+                                  (pdir, fname, entryname), rt, sname)
+                else:
+                    h5writer.link("%s:/%s" % (fname, entryname), rt, sname)
                 self.debug("Link  '%s' in '%s' created " % (sname, mntname))
             rt.close()
             fl.close()