sardana-nxsrecorder 3.27.0__py3-none-any.whl → 3.28.1__py3-none-any.whl

{sardana_nxsrecorder-3.27.0.dist-info → sardana_nxsrecorder-3.28.1.dist-info}/METADATA

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

sardana_nxsrecorder-3.28.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+sardananxsrecorder/__init__.py,sha256=6f4z75CSpGzc7npZOYVoYLWrZSskxrwIL3ycegwf0UA,896
+sardananxsrecorder/nxsrecorder.py,sha256=3JCs47ZUFPvRwnAEPEreMigq0M_lswLKNrc2xxmBZFI,59381
+sardana_nxsrecorder-3.28.1.dist-info/METADATA,sha256=fBQs5k_8RAZpE4xqChA2-T_0l1MOmtA7GEec6PlaQXg,8035
+sardana_nxsrecorder-3.28.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+sardana_nxsrecorder-3.28.1.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
+sardana_nxsrecorder-3.28.1.dist-info/RECORD,,

sardananxsrecorder/__init__.py

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

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,8 +1347,14 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         sid = self.__serial
         fdir, fname = os.path.split(self.filename)
-        if bool(self.__getEnvVar("ScanFileInScanNameDir", False)):
-            fdir = os.path.dirname(os.path.abspath(fdir))
+        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-"
@@ -1367,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 % "")
@@ -1380,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', {}))
@@ -1404,7 +1414,7 @@ class NXS_FileRecorder(BaseFileRecorder):
             commands.append(sname)
             commands.append("__command__ stop")
             commands.append("%s:%s" % (scanname, time.time()))
-            commands.append("__command__ start %s" % scanname)
+            # commands.append("__command__ start %s" % scanname)
             sname = "\n".join(commands)
 
             sm[fdir] = scanname
@@ -1418,12 +1428,18 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         sid = self.__serial
         fdir, fname = os.path.split(self.filename)
-        if bool(self.__getEnvVar("ScanFileInScanNameDir", False)):
-            fdir = os.path.dirname(os.path.abspath(fdir))
+        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 % "")
@@ -1458,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()

sardana_nxsrecorder-3.27.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-sardananxsrecorder/__init__.py,sha256=OJHfgiQR7I36ICO3Lvh9KKyHE4H2vU8b4Gu_sTyR6V0,896
-sardananxsrecorder/nxsrecorder.py,sha256=nT6o1p6F7rNUR1VJ-omEFznpgbQ3XC90w9axV9GPRXE,58593
-sardana_nxsrecorder-3.27.0.dist-info/METADATA,sha256=WWIN6OtKX_CQpshvyk4rDksMBwpLj1nMXWyZUi39c5o,8035
-sardana_nxsrecorder-3.27.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-sardana_nxsrecorder-3.27.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
-sardana_nxsrecorder-3.27.0.dist-info/RECORD,,