add support ScanFileInScanNameDir env variable (#684)

ChangeLog

@@ -1,3 +1,7 @@
+2024-07-10 Jan Kotanski <[email protected]>
+	* add support ScanFileInScanNameDir env variable
+	* tagged as v4.10.0
+
 2024-07-10 Jan Kotanski <[email protected]>
 	* improve support for eiger RoiMode attribute
 	* tagged as v4.9.1

man/nxscollect.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 "NXSCOLLECT" "1" "Jul 09, 2024" "4.9" "NXSTools"
+.TH "NXSCOLLECT" "1" "Jul 10, 2024" "4.10" "NXSTools"
 .SH NAME
 nxscollect \- upload external images into NeXus/HDF5 file
 .SH DESCRIPTION

man/nxsconfig.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 "NXSCONFIG" "1" "Jul 09, 2024" "4.9" "NXSTools"
+.TH "NXSCONFIG" "1" "Jul 10, 2024" "4.10" "NXSTools"
 .SH NAME
 nxsconfig \- read NeXus Configuration Server settings
 .SH DESCRIPTION

man/nxscreate.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 "NXSCREATE" "1" "Jul 09, 2024" "4.9" "NXSTools"
+.TH "NXSCREATE" "1" "Jul 10, 2024" "4.10" "NXSTools"
 .SH NAME
 nxscreate \- create NeXus Configuration component
 .SH DESCRIPTION

man/nxsdata.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 "NXSDATA" "1" "Jul 09, 2024" "4.9" "NXSTools"
+.TH "NXSDATA" "1" "Jul 10, 2024" "4.10" "NXSTools"
 .SH NAME
 nxsdata \- run NeXus Data Writer
 .SH DESCRIPTION

man/nxsetup.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 "NXSETUP" "1" "Jul 09, 2024" "4.9" "NXSTools"
+.TH "NXSETUP" "1" "Jul 10, 2024" "4.10" "NXSTools"
 .SH NAME
 nxsetup \- set NeXDaTaS Tango Server environment up
 .SH DESCRIPTION

man/nxsfileinfo.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 "NXSFILEINFO" "1" "Jul 09, 2024" "4.9" "NXSTools"
+.TH "NXSFILEINFO" "1" "Jul 10, 2024" "4.10" "NXSTools"
 .SH NAME
 nxsfileinfo \- show metadata of the NeXus file
 .SH DESCRIPTION

man/nxstools.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 "NXSTOOLS" "1" "Jul 09, 2024" "4.9" "NXSTools"
+.TH "NXSTOOLS" "1" "Jul 10, 2024" "4.10" "NXSTools"
 .SH NAME
 nxstools \- nxstools Documentation
 .sp

nxstools/pyeval/scdataset.py

@@ -132,6 +132,8 @@ def append_scicat_dataset(macro, status_info=True, reingest=False):
         if grouping:
             commands = []
             fdir = macro.getEnv('ScanDir')
+            if bool(get_env_var(macro, 'ScanFileInScanNameDir', False)):
+                fdir = os.path.dirname(os.path.abspath(fdir))
             try:
                 sm = dict(get_env_var(macro, 'SciCatMeasurements', {}))
             except Exception:
@@ -172,6 +174,8 @@ def append_scicat_record(macro, sname, status_info=True):
     """
     # get beamtime id
     fdir = macro.getEnv('ScanDir')
+    if bool(get_env_var(macro, 'ScanFileInScanNameDir', False)):
+        fdir = os.path.dirname(os.path.abspath(fdir))
     bmtfpath = get_env_var(macro, "BeamtimeFilePath", "/gpfs/current")
     bmtfprefix = get_env_var(
         macro, "BeamtimeFilePrefix", "beamtime-metadata-")

nxstools/release.py

@@ -19,4 +19,4 @@
 """  NXS tools release version"""
 
 #: (:obj:`str`) package version
-__version__ = "4.9.1"
+__version__ = "4.10.0"