reingest scan if it is repeated with the same ScanID (#647)

ChangeLog

@@ -1,3 +1,7 @@
+2024-06-05 Jan Kotanski <jankotan@gmail.com>
+	* reingest scan metadata if it is repeated with the same ScanID (#647)
+	* tagged as v4.2.1
+
 2024-06-03 Jan Kotanski <jankotan@gmail.com>
 	* adapt append_scicat_dataset to _%05d and _{ScanID:05d} formatting (#643)
 	* tagged as v4.2.0

nxstools/pyeval/scdataset.py

@@ -24,6 +24,7 @@
 import tango
 import json
 import time
+import re
 
 # from sardana.macroserver.macro import Macro
 
@@ -119,6 +120,12 @@ def append_scicat_dataset(macro, status_info=True, reingest=False):
                 scanname, entryname, sid, scanname, sid)
         if reingest:
             sname = "%s:%s" % (sname, time.time())
+        else:
+            skip_acq = get_env_var(macro, 'NeXusSkipAcquisitionModes', [])
+            if isinstance(skip_acq, str):
+                skip_acq = re.split(r"[-;,.\s]\s*", skip_acq)
+            if "INIT" in skip_acq:
+                sname = "%s:%s" % (sname, time.time())
 
         # auto grouping
         grouping = bool(get_env_var(macro, 'SciCatAutoGrouping', False))

nxstools/release.py

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