From 50910c2dd75028e4e5462057919f92dcd5143cd4 Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Sun, 14 Jul 2024 13:18:28 +0200 Subject: [PATCH] Issue 693: fix support for ScanNames=False (#695) * fix support for ScanNames=False * apply pep8 * update for the fix * update for the fix --- ChangeLog | 5 +++++ nxstools/pyeval/scdataset.py | 18 +++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a1e4a36..adac048b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-07-15 Jan Kotanski + * fix ScanFileinScanNameDir name to ScanNames (#694) + * fix support for ScanNames=False (#695) + * tagged as v4.11.1 + 2024-07-15 Jan Kotanski * fix ScanFileinScanNameDir name to ScanNames (#694) * tagged as v4.11.1 diff --git a/nxstools/pyeval/scdataset.py b/nxstools/pyeval/scdataset.py index e956680a..1ad88fee 100644 --- a/nxstools/pyeval/scdataset.py +++ b/nxstools/pyeval/scdataset.py @@ -127,13 +127,21 @@ def append_scicat_dataset(macro, status_info=True, reingest=False): if "INIT" in skip_acq: sname = "%s:%s" % (sname, time.time()) + fdir = macro.getEnv('ScanDir') + snmode = get_env_var(macro, 'ScanNames', None) + 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)) + if pdir: + sname = "%s/%s" % (pdir, sname) + # auto grouping grouping = bool(get_env_var(macro, 'SciCatAutoGrouping', False)) - if grouping: + if grouping or pdir: commands = [] - fdir = macro.getEnv('ScanDir') - if bool(get_env_var(macro, 'ScanNames', False)): - fdir = os.path.dirname(os.path.abspath(fdir)) try: sm = dict(get_env_var(macro, 'SciCatMeasurements', {})) except Exception: @@ -174,7 +182,7 @@ def append_scicat_record(macro, sname, status_info=True): """ # get beamtime id fdir = macro.getEnv('ScanDir') - if bool(get_env_var(macro, 'ScanNames', False)): + if get_env_var(macro, 'ScanNames', None) is not None: fdir = os.path.dirname(os.path.abspath(fdir)) bmtfpath = get_env_var(macro, "BeamtimeFilePath", "/gpfs/current") bmtfprefix = get_env_var(