From 90600db66e7c11491efc19e5c46cf58fd06e3f9a Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 18 Feb 2025 20:12:03 -0600
Subject: [PATCH] fix: Use raw string when `\d` in wildcard pattern (#61)
---
.../demp/Snakefile | 30 +++++++++----------
.../diffractive_vm/Snakefile | 2 +-
benchmarks/Inclusive/dis/Snakefile | 12 ++++----
benchmarks/Jets-HF/jets/Snakefile | 6 ++--
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/benchmarks/Exclusive-Diffraction-Tagging/demp/Snakefile b/benchmarks/Exclusive-Diffraction-Tagging/demp/Snakefile
index 8dcb602c..156eeec7 100644
--- a/benchmarks/Exclusive-Diffraction-Tagging/demp/Snakefile
+++ b/benchmarks/Exclusive-Diffraction-Tagging/demp/Snakefile
@@ -26,9 +26,9 @@ rule demp_sim:
params:
N_EVENTS=100
wildcard_constraints:
- EBEAM="\d+",
- PBEAM="\d+",
- INDEX="\d+",
+ EBEAM=r"\d+",
+ PBEAM=r"\d+",
+ INDEX=r"\d+",
shell:
"""
ddsim \
@@ -49,9 +49,9 @@ rule demp_reco:
output:
"reco/{DETECTOR_CONFIG}/demp_{EBEAM}x{PBEAM}_{INDEX}.edm4eic.root",
wildcard_constraints:
- EBEAM="\d+",
- PBEAM="\d+",
- INDEX="\d+",
+ EBEAM=r"\d+",
+ PBEAM=r"\d+",
+ INDEX=r"\d+",
shell:
"""
DETECTOR_CONFIG={wildcards.DETECTOR_CONFIG} eicrecon {input} -Ppodio:output_file={output}
@@ -68,9 +68,9 @@ rule demp_analysis:
hists="results/{DETECTOR_CONFIG}/demp/{PREFIX}demp_{EBEAM}x{PBEAM}_{INDEX}/hists.root",
wildcard_constraints:
PREFIX= ".*",
- EBEAM="\d+",
- PBEAM="\d+",
- INDEX="\d+",
+ EBEAM=r"\d+",
+ PBEAM=r"\d+",
+ INDEX=r"\d+",
shell:
"""
cat > {output.config} <<EOF
@@ -94,9 +94,9 @@ rule demp_combine:
hists="results/{DETECTOR_CONFIG}/demp/{PREFIX}demp_{EBEAM}x{PBEAM}_combined_{NUM_FILES}/hists.root",
wildcard_constraints:
PREFIX= ".*",
- EBEAM="\d+",
- PBEAM="\d+",
- NUM_FILES="\d+",
+ EBEAM=r"\d+",
+ PBEAM=r"\d+",
+ NUM_FILES=r"\d+",
shell:
"""
cat > {output.config} <<EOF
@@ -122,9 +122,9 @@ rule demp_plots:
"results/{DETECTOR_CONFIG}/demp/{PREFIX}demp_{EBEAM}x{PBEAM}_combined_{NUM_FILES}/plots.pdf"
wildcard_constraints:
PREFIX= ".*",
- EBEAM="\d+",
- PBEAM="\d+",
- NUM_FILES="\d+",
+ EBEAM=r"\d+",
+ PBEAM=r"\d+",
+ NUM_FILES=r"\d+",
shell:
"""
root -l -b -q '{input.script}+("{input.config}")'
diff --git a/benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/Snakefile b/benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/Snakefile
index e95266c4..9440be9b 100644
--- a/benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/Snakefile
+++ b/benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/Snakefile
@@ -95,7 +95,7 @@ rule diffractive_vm_combine_sartre:
wildcard_constraints:
PREFIX=".*", # can be empty
PARTICLE="[^_]*",
- NUM_FILES="\d+",
+ NUM_FILES=r"\d+",
SUFFIX=".*", # can be empty
output:
config="results/{DETECTOR_CONFIG}/diffractive_vm/{PREFIX}sartre_{PARTICLE}_combined_{NUM_FILES}{SUFFIX}/config.json",
diff --git a/benchmarks/Inclusive/dis/Snakefile b/benchmarks/Inclusive/dis/Snakefile
index d53052ff..184e42fa 100644
--- a/benchmarks/Inclusive/dis/Snakefile
+++ b/benchmarks/Inclusive/dis/Snakefile
@@ -91,9 +91,9 @@ rule dis_analysis_kinematics_correlations:
params:
N_EVENTS=100
wildcard_constraints:
- EBEAM="\d+",
- PBEAM="\d+",
- MINQ2="\d+",
+ EBEAM=r"\d+",
+ PBEAM=r"\d+",
+ MINQ2=r"\d+",
shell: """
mkdir {output.results_path}
python benchmarks/Inclusive/dis/analysis/kinematics_correlations.py --rec_file "{input.data}" --config dis_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}_{wildcards.DETECTOR_CONFIG} --results_path {output.results_path} --nevents {params.N_EVENTS}
@@ -108,9 +108,9 @@ rule dis_analysis_truth_reconstruction:
params:
N_EVENTS=100
wildcard_constraints:
- EBEAM="\d+",
- PBEAM="\d+",
- MINQ2="\d+",
+ EBEAM=r"\d+",
+ PBEAM=r"\d+",
+ MINQ2=r"\d+",
shell: """
mkdir {output.results_path}
python benchmarks/Inclusive/dis/analysis/truth_reconstruction.py --rec_file "{input.data}" --config dis_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}_{wildcards.DETECTOR_CONFIG} --results_path $(dirname {output.results_path}) --nevents {params.N_EVENTS}
diff --git a/benchmarks/Jets-HF/jets/Snakefile b/benchmarks/Jets-HF/jets/Snakefile
index a6c950d3..5e686964 100644
--- a/benchmarks/Jets-HF/jets/Snakefile
+++ b/benchmarks/Jets-HF/jets/Snakefile
@@ -34,9 +34,9 @@ rule jets_analysis_jets:
output:
results_path=directory("results/{DETECTOR_CONFIG}/jets/{EBEAM}on{PBEAM}/minQ2={MINQ2}"),
wildcard_constraints:
- EBEAM="\d+",
- PBEAM="\d+",
- MINQ2="\d+",
+ EBEAM=r"\d+",
+ PBEAM=r"\d+",
+ MINQ2=r"\d+",
shell: """
mkdir {output.results_path}
root -l -b -q '{input.script}+("{input.config}")'
--
GitLab