legend-dataflow-scripts 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

{legend_dataflow_scripts-0.2.0.dist-info → legend_dataflow_scripts-0.2.1.dist-info}/METADATA

@@ -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.dist-info → legend_dataflow_scripts-0.2.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 legenddataflowscripts/__init__.py,sha256=hlpvTxSBjOyXlZUyOyYx3VwT5LS6zNzhAZnTmfT3NjU,303
-legenddataflowscripts/_version.py,sha256=Dg8AmJomLVpjKL6prJylOONZAPRtB86LOce7dorQS_A,704
+legenddataflowscripts/_version.py,sha256=vYqoJTG51NOUmYyL0xt8asRK8vUT4lGAdal_EZ59mvw,704
 legenddataflowscripts/par/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 legenddataflowscripts/par/geds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 legenddataflowscripts/par/geds/dsp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 legenddataflowscripts/par/geds/dsp/dplms.py,sha256=GjOPuBuLPtzBEkfmLMSkxSSeBBsY7-wy0rY3jLjAJv0,5298
 legenddataflowscripts/par/geds/dsp/eopt.py,sha256=MP_prgRL4Aqj_iNIpxHks2v4NY6B_iWh3SgcxQFhixk,13506
-legenddataflowscripts/par/geds/dsp/evtsel.py,sha256=E0jJIuqaywIidr4K-PPMFlctZ9oumuSmiX5zKDPHVlA,17144
+legenddataflowscripts/par/geds/dsp/evtsel.py,sha256=9UEoyJ2aSRkGyANN1QCPqn69s-9lmdsuPE3a6fWl3ls,17383
 legenddataflowscripts/par/geds/dsp/nopt.py,sha256=vHwlHbmBlozVHO1u89FwAx8c_kazTsxMqZGpbyjN-1M,3980
 legenddataflowscripts/par/geds/dsp/pz.py,sha256=epYHSAqz13QLjxfnm38zH1Caaih5efuwNlgCipHD5Do,8148
 legenddataflowscripts/par/geds/dsp/svm.py,sha256=eDneRB_PQZp8Q4n2VheTX3kbu4ufZQ-jnuCCjvtwFpk,826
@@ -29,9 +29,9 @@ legenddataflowscripts/workflow/__init__.py,sha256=JhudKYhBT8bXtX4LCqxQCHzUiITpug
 legenddataflowscripts/workflow/execenv.py,sha256=qTG4N9ovEPxA0QtqG0wWUIuK50BZIcYvpVlpy-XgxPw,9257
 legenddataflowscripts/workflow/filedb.py,sha256=rbvOcXUxLbHz177QuDIDAL3aysz-bZDjHOiMsRHssZo,3434
 legenddataflowscripts/workflow/pre_compile_catalog.py,sha256=cEK0KXh-ClSE2Bo9MK471o79XG22bMY5r-2tIihtCfk,790
-legenddataflowscripts/workflow/utils.py,sha256=eKE8KIG2ffynZt9fTbI1SVQV85i3aW9GFGh1Nio1iDo,3118
-legend_dataflow_scripts-0.2.0.dist-info/METADATA,sha256=lTH14CoB_S_IUgAPggbXmI1mN35E0hvEjdK_YGWUpLw,3122
-legend_dataflow_scripts-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-legend_dataflow_scripts-0.2.0.dist-info/entry_points.txt,sha256=B197waSm-orA_ZS-9rkxNDsmOHdCn8CbWodnlqXQKRg,1313
-legend_dataflow_scripts-0.2.0.dist-info/top_level.txt,sha256=s8E2chjJNYUbrN6whFG_VCsJKySFp1IOXLcUefA7DB0,22
-legend_dataflow_scripts-0.2.0.dist-info/RECORD,,
+legenddataflowscripts/workflow/utils.py,sha256=VVCsj7wNaqV6sw2Xnk_xykhVv3BKTX4hqQtKE4UUayg,3170
+legend_dataflow_scripts-0.2.1.dist-info/METADATA,sha256=2KkkVU3SmbLQJnYeiBdhFbSslvpxnzhxbWmE7FZkRDk,3122
+legend_dataflow_scripts-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+legend_dataflow_scripts-0.2.1.dist-info/entry_points.txt,sha256=B197waSm-orA_ZS-9rkxNDsmOHdCn8CbWodnlqXQKRg,1313
+legend_dataflow_scripts-0.2.1.dist-info/top_level.txt,sha256=s8E2chjJNYUbrN6whFG_VCsJKySFp1IOXLcUefA7DB0,22
+legend_dataflow_scripts-0.2.1.dist-info/RECORD,,

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 = None

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"]

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):