fix snakefile

legend-exp · Feb 13, 2025 · 3b59c02 · 3b59c02
1 parent 3a845df
commit 3b59c02
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/dataflow-config.yaml b/dataflow-config.yaml
@@ -1,4 +1,5 @@
 legend_metadata_version: main
+allow_none_par: true
 
 paths:
   sandbox_path: $_/sandbox
@@ -15,8 +16,8 @@ paths:
 
   tier: $_/generated/tier
   tier_daq: $_/generated/tier/daq
-  tier_raw: /data1/shared/l200-p13/prodenv/prod-orig/ref-raw/generated/tier/raw
-  tier_tcm: /data1/shared/l200-p13/prodenv/prod-orig/ref-raw/generated/tier/tcm
+  tier_raw: $_/../ref-raw/generated/tier/raw
+  tier_tcm: $_/../ref-raw/generated/tier/tcm
   tier_dsp: $_/generated/tier/dsp
   tier_hit: $_/generated/tier/hit
   tier_ann: $_/generated/tier/ann

diff --git a/workflow/rules/dsp_pars_spms.smk b/workflow/rules/dsp_pars_spms.smk
@@ -8,26 +8,31 @@ from legenddataflow import utils, execenv_pyexe
 
 rule build_pars_dsp_tau_spms:
     input:
-        filelist=Path(utils.filelist_path(config)) / "all-{experiment}-{period}-{run}-{datatype}-raw.filelist"
-        pardb=lambda wildcards: get_overwrite_file("dsp", wildcards)
+        filelist=Path(utils.filelist_path(config))
+        / "all-{experiment}-{period}-{run}-{datatype}-raw.filelist",
+        pardb=lambda wildcards: get_overwrite_file("dsp", wildcards),
     params:
         timestamp="{timestamp}",
         datatype="{datatype}",
         channel="{channel}",
         raw_table_name=lambda wildcards: get_table_name(
-            metadata, config, wildcards.datatype, wildcards.timestamp, wildcards.channel, "raw"
+            metadata,
+            config,
+            wildcards.datatype,
+            wildcards.timestamp,
+            wildcards.channel,
+            "raw",
         ),
     wildcard_constraints:
-        datatype=r"\b(?!cal\b|xtc\b)\w+\b"
+        datatype=r"\b(?!cal\b|xtc\b)\w+\b",
     output:
         temp(patt.get_pattern_pars_tmp_channel(config, "dsp", "spms_trigger_threshold")),
     log:
         patt.get_pattern_log_channel(config, "spms_trigger_threshold", time),
     group:
         "par-dsp"
     shell:
-        execenv_pyexe(config, "par-spms-dsp-trg-thr") + \
-        "--config-path {configs} "
+        execenv_pyexe(config, "par-spms-dsp-trg-thr") + "--config-path {configs} "
         "--raw-files {input.filelist} "
         "--dsp-db {input.pardb} "
         "--datatype {params.datatype} "