restage 0.1.13__tar.gz → 0.1.15__tar.gz

{restage-0.1.13/src/restage.egg-info → restage-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: restage
-Version: 0.1.13
+Version: 0.1.15
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Description-Content-Type: text/markdown
@@ -8,7 +8,7 @@ Requires-Dist: zenlog==1.1
 Requires-Dist: platformdirs==3.11
 Requires-Dist: psutil==5.9.6
 Requires-Dist: importlib_metadata; python_version < "3.8"
-Requires-Dist: mccode-antlr[hdf5]==0.2.10
+Requires-Dist: mccode-antlr[hdf5]==0.2.11
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: chopcal; extra == "test"

{restage-0.1.13 → restage-0.1.15}/pyproject.toml

@@ -9,7 +9,7 @@ dependencies = [
     'platformdirs==3.11',
     'psutil==5.9.6',
     "importlib_metadata; python_version<'3.8'",
-    'mccode-antlr[hdf5]==0.2.10',
+    'mccode-antlr[hdf5]==0.2.11',
 ]
 readme = "README.md"
 authors = [

{restage-0.1.13 → restage-0.1.15}/src/restage/splitrun.py

@@ -217,13 +217,11 @@ def splitrun_pre(instr, parameters, grid, precision: dict[str, float],
     # from joblib import Parallel, delayed
     # Parallel(n_jobs=-3)(delayed(step)(values) for values in scan)
 
-    # If the parameters are empty, we still need to run the simulation once:
-    if n_pts == 0:
-        step([])
-        return entry
-
     for values in scan:
         step(values)
+    if n_pts == 0:
+        # If the parameters are empty, we still need to run the simulation once:
+        step([])
     return entry
 
 
@@ -279,9 +277,9 @@ def splitrun_combined(pre_entry, pre, post, pre_parameters, post_parameters, gri
         # convert, e.g., energy parameters to chopper parameters:
         pars = translate({n: v for n, v in zip(names, values)})
         # parameters for the primary instrument:
-        primary_pars = {k: v for k, v in pars.items() if k in pre_parameters}
+        primary_pars = {k: v for k, v in pars.items() if pre.has_parameter(k)}
         # parameters for the secondary instrument:
-        secondary_pars = {k: v for k, v in pars.items() if k in post_parameters}
+        secondary_pars = {k: v for k, v in pars.items() if post.has_parameter(k)}
         # use the parameters for the primary instrument to construct a (partial) simulation entry for matching
         primary_table_parameters = collect_parameter_dict(pre, primary_pars, strict=True)
         primary_sent = SimulationEntry(primary_table_parameters, precision=precision, **sit_kw)
@@ -300,8 +298,10 @@ def splitrun_combined(pre_entry, pre, post, pre_parameters, post_parameters, gri
             dat_lines.append(line)
         if callback is not None:
             arguments = {}
+            # 'names' _is_ a list already
             arg_names = names + ['number', 'n_pts', 'pars', 'dir', 'arguments']
-            arg_values = values + [number, n_pts, pars, runtime_arguments['dir'], runtime_arguments]
+            # 'values' is a tuple, so we need to convert it to a list
+            arg_values = list(values) + [number, n_pts, pars, runtime_arguments['dir'], runtime_arguments]
             for x, v in zip(arg_names, arg_values):
                 if callback_arguments is not None and x in callback_arguments:
                     arguments[callback_arguments[x]] = v

{restage-0.1.13 → restage-0.1.15/src/restage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: restage
-Version: 0.1.13
+Version: 0.1.15
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Description-Content-Type: text/markdown
@@ -8,7 +8,7 @@ Requires-Dist: zenlog==1.1
 Requires-Dist: platformdirs==3.11
 Requires-Dist: psutil==5.9.6
 Requires-Dist: importlib_metadata; python_version < "3.8"
-Requires-Dist: mccode-antlr[hdf5]==0.2.10
+Requires-Dist: mccode-antlr[hdf5]==0.2.11
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: chopcal; extra == "test"

{restage-0.1.13 → restage-0.1.15}/src/restage.egg-info/requires.txt

@@ -1,7 +1,7 @@
 zenlog==1.1
 platformdirs==3.11
 psutil==5.9.6
-mccode-antlr[hdf5]==0.2.10
+mccode-antlr[hdf5]==0.2.11
 
 [:python_version < "3.8"]
 importlib_metadata