restage 0.1.13__py3-none-any.whl → 0.1.15__py3-none-any.whl

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.dist-info → restage-0.1.15.dist-info}/METADATA

@@ -1,13 +1,13 @@
 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
 Requires-Dist: zenlog ==1.1
 Requires-Dist: platformdirs ==3.11
 Requires-Dist: psutil ==5.9.6
-Requires-Dist: mccode-antlr[hdf5] ==0.2.10
+Requires-Dist: mccode-antlr[hdf5] ==0.2.11
 Requires-Dist: importlib-metadata ; python_version < "3.8"
 Provides-Extra: test
 Requires-Dist: pytest ; extra == 'test'

{restage-0.1.13.dist-info → restage-0.1.15.dist-info}/RECORD

@@ -10,10 +10,10 @@ restage/mcpl.py,sha256=0F9A_edwSR9awQipicI3ipsMAJFk9zCspJhCOrmhkDg,2407
 restage/range.py,sha256=hOQsiHXSt1OEX8ZcvfmzQN4f2Mo7paX681TZCdvSkTk,8073
 restage/run.py,sha256=nk8d7cIyIqSt-5pyGm68Zak5H1a-fbo_z2_36eN-08E,1481
 restage/scan.py,sha256=Yx8OQSBG6I2_64sW0LIDb0glVKwWoxUQQznASXgDZFQ,1432
-restage/splitrun.py,sha256=I1UZNC4QKzkmPGNFooDh3tYRVesEcXSHaPOYM9iHb8Q,23059
+restage/splitrun.py,sha256=zCm9CHoD8Jr4_Db9FFzJz3ZyV5oxUXI_UfVhmYxUrYw,23161
 restage/tables.py,sha256=VMApcu4KtsBlUvAqCSKHDZ58FXhNPihr90OU12YAejw,15764
-restage-0.1.13.dist-info/METADATA,sha256=wW_n22L2D77PvknnFU9Ffs69s3EoQlTd-c5PVasQ5Us,4775
-restage-0.1.13.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-restage-0.1.13.dist-info/entry_points.txt,sha256=dY3ZanXW6rBLd2vBo-WMcbgO7E10GVDE0t9GASuVjgY,90
-restage-0.1.13.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
-restage-0.1.13.dist-info/RECORD,,
+restage-0.1.15.dist-info/METADATA,sha256=B9PU2Eoi92Z4P6Vv-GtOGWWTIva6Xlv01EMmawUMuow,4775
+restage-0.1.15.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+restage-0.1.15.dist-info/entry_points.txt,sha256=dY3ZanXW6rBLd2vBo-WMcbgO7E10GVDE0t9GASuVjgY,90
+restage-0.1.15.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
+restage-0.1.15.dist-info/RECORD,,

{restage-0.1.13.dist-info → restage-0.1.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any