legend-dataflow-scripts 0.2.0__tar.gz → 0.2.1__tar.gz

{legend_dataflow_scripts-0.2.0/src/legend_dataflow_scripts.egg-info → legend_dataflow_scripts-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.2.0
+Version: 0.2.1
 Summary: Python package for the processing scripts for LEGEND-200 data
 Author-email: George Marshall <ggmarsh@uw.edu>, Luigi Pertoldi <gipert@pm.me>
 Maintainer: The LEGEND Collaboration

{legend_dataflow_scripts-0.2.0 → legend_dataflow_scripts-0.2.1/src/legend_dataflow_scripts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend-dataflow-scripts
-Version: 0.2.0
+Version: 0.2.1
 Summary: Python package for the processing scripts for LEGEND-200 data
 Author-email: George Marshall <ggmarsh@uw.edu>, Luigi Pertoldi <gipert@pm.me>
 Maintainer: The LEGEND Collaboration

{legend_dataflow_scripts-0.2.0 → legend_dataflow_scripts-0.2.1}/src/legenddataflowscripts/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.0'
-__version_tuple__ = version_tuple = (0, 2, 0)
+__version__ = version = '0.2.1'
+__version_tuple__ = version_tuple = (0, 2, 1)
 
-__commit_id__ = commit_id = 'g39085207f'
+__commit_id__ = commit_id = 'g68aa434fe'

{legend_dataflow_scripts-0.2.0 → legend_dataflow_scripts-0.2.1}/src/legenddataflowscripts/par/geds/dsp/evtsel.py

@@ -82,7 +82,7 @@ def get_out_data(
 
 def par_geds_dsp_evtsel() -> None:
     argparser = argparse.ArgumentParser()
-    argparser.add_argument("--raw-filelist", help="raw_filelist", type=str)
+    argparser.add_argument("--raw-filelist", help="raw_filelist", type=str, nargs="*")
     argparser.add_argument(
         "--pulser-file", help="pulser-file", type=str, required=False
     )
@@ -139,8 +139,16 @@ def par_geds_dsp_evtsel() -> None:
     if peak_dict.pop("run_selection") is True:
         log.debug("Starting peak selection")
 
-        with Path(args.raw_filelist).open() as f:
-            files = f.read().splitlines()
+        if (
+            isinstance(args.raw_filelist, list)
+            and args.raw_filelist[0].split(".")[-1] == "filelist"
+        ):
+            files = args.raw_filelist[0]
+            with Path(files).open() as f:
+                files = f.read().splitlines()
+        else:
+            files = args.raw_filelist
+
         raw_files = sorted(files)
 
         peaks_kev = peak_dict["peaks"]

{legend_dataflow_scripts-0.2.0 → legend_dataflow_scripts-0.2.1}/src/legenddataflowscripts/workflow/utils.py

@@ -49,7 +49,8 @@ def subst_vars(
     if use_env:
         combined_var_values = dict(iter(os.environ.items()))
         combined_var_values.update(copy.copy(var_values))
-    subst_vars_impl(props, combined_var_values, ignore_missing)
+
+    return subst_vars_impl(props, combined_var_values, ignore_missing)
 
 
 def subst_vars_in_snakemake_config(workflow, config):
@@ -65,10 +66,11 @@ def subst_vars_in_snakemake_config(workflow, config):
         use_env=True,
         ignore_missing=False,
     )
-    if "system" in config:
-        config["execenv"] = config["execenv"][config["system"]]
-    else:
-        config["execenv"] = config["execenv"]["bare"]
+    if "execenv" in config:
+        if "system" in config:
+            config["execenv"] = config["execenv"][config["system"]]
+        else:
+            config["execenv"] = config["execenv"]["bare"]
 
 
 def set_last_rule_name(workflow, new_name):