diff --git a/.buildinfo b/.buildinfo index 0d4b31b..5aefa44 100644 --- a/.buildinfo +++ b/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: fabf8f614985e2d12cd5cd9639880feb +config: c58a35c347aab6c80cf903df4cd5477c tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/_modules/index.html b/_modules/index.html index ebe4b41..370d86d 100644 --- a/_modules/index.html +++ b/_modules/index.html @@ -4,7 +4,7 @@
-sid = self.__serial fdir, fname = os.path.split(self.filename) snmode = self.__getEnvVar("ScanNames", None) + nometa = self.__getEnvVar("ScanNamesNoMetadata", False) + nogrouping = self.__getEnvVar("ScanNamesNoGrouping", False) appendentry = self.__getConfVar("AppendEntry", False) pdir = None if snmode is not None: @@ -1512,22 +1514,28 @@
if fdir in sm.keys(): cgrp = sm[fdir] if cgrp != scanname: - commands.append("__command__ stop") - commands.append("%s:%s" % (cgrp, time.time())) - commands.append("__command__ start %s" % scanname) + if not nogrouping and not nometa: + commands.append("__command__ stop") + commands.append("%s:%s" % (cgrp, time.time())) + commands.append("__command__ start %s" % scanname) else: - commands.append("__command__ start %s" % scanname) - commands.append(sname) - commands.append("__command__ stop") - commands.append("%s:%s" % (scanname, time.time())) - # commands.append("__command__ start %s" % scanname) + if not nogrouping and not nometa: + commands.append("__command__ start %s" % scanname) + if not nometa: + commands.append(sname) + if not nogrouping and not nometa: + commands.append("__command__ stop") + if not nogrouping: + commands.append("%s:%s" % (scanname, time.time())) sname = "\n".join(commands) - sm[fdir] = scanname + if not nogrouping and not nometa: + sm[fdir] = scanname self.__env['SciCatMeasurements'] = sm - with open(dslfile, "a+") as fl: - fl.write("\n%s" % sname) + if sname: + with open(dslfile, "a+") as fl: + fl.write("\n%s" % sname) def __createMeasurementFile(self): """ create measurement file """ diff --git a/_static/documentation_options.js b/_static/documentation_options.js index 930ffb2..1e98436 100644 --- a/_static/documentation_options.js +++ b/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '3.28.1', + VERSION: '3.29.0', LANGUAGE: 'en', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/genindex.html b/genindex.html index 9f35bff..18d8db1 100644 --- a/genindex.html +++ b/genindex.html @@ -4,7 +4,7 @@
-NOSTEP
, NOFINAL
, MESH
, VDS
separated by commas
+ScanNames (bool) - special mode of using ScanName directories i.e.
+True
: the master file in the ScanName directory,
False
: the master file in the grouping ScanName directory (e.g. without ScanID),
None
(or undefined): standard mode where the master files are outside the ScanName directory
ScanNamesNoGrouping (bool) - do not perform grouping when ScanNames
is False
ScanNamesNoMetadata (bool) - do not perform master file metadata ingestion when ScanNames
is False
Contents: