Merge with \master

.gitlab-ci.yml

@@ -107,6 +107,7 @@ common:setup:
       - runner_system_failure
 
 include:
+<<<<<<< HEAD
   - local: 'benchmarks/diffractive_vm/config.yml'
   - local: 'benchmarks/demp/config.yml'
   - local: 'benchmarks/dis/config.yml'
@@ -116,6 +117,15 @@ include:
   - local: 'benchmarks/tcs/config.yml'
   - local: 'benchmarks/u_omega/config.yml'
   - local: 'benchmarks/backgrounds/config.yml'
+=======
+  - local: 'benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/config.yml'
+  - local: 'benchmarks/Exclusive-Diffraction-Tagging/demp/config.yml'
+    #- local: 'benchmarks/Exclusive-Diffraction-Tagging/dvmp/config.yml'
+  - local: 'benchmarks/Exclusive-Diffraction-Tagging/dvcs/config.yml'
+  - local: 'benchmarks/Exclusive-Diffraction-Tagging/tcs/config.yml'
+  - local: 'benchmarks/Exclusive-Diffraction-Tagging/u_omega/config.yml'
+  - local: 'benchmarks/Inclusive/dis/config.yml'
+>>>>>>> master
 
 summary:
   stage: finish
@@ -126,7 +136,6 @@ summary:
     - "dvcs:results"
     - "tcs:results"
     - "u_omega:results"
-    - "backgrounds:results"
   script:
     - collect_benchmarks.py
     - find results -print | sort | tee summary.txt

README.md

@@ -13,7 +13,7 @@ Physics Benchmarks for the EIC
 
 ## Adding new benchmarks
 
-See the [`benchmarks/diffractive_vm`](https://github.com/eic/physics_benchmarks/tree/master/benchmarks/diffractive_vm)
+See the [`benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm`](https://github.com/eic/physics_benchmarks/tree/master/benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm)
 directory for a basic example. Note currently the reconstruction is far from perfect.
 
 ### Pass/Fail tests

Snakefile

@@ -41,7 +41,14 @@ ddsim \
   --enableGun
 """
 
+<<<<<<< HEAD
 include: "benchmarks/diffractive_vm/Snakefile"
 include: "benchmarks/dis/Snakefile"
 include: "benchmarks/demp/Snakefile"
 include: "benchmarks/semi_coherent/Snakefile"
+=======
+include: "benchmarks/Exclusive-Diffraction-Tagging/demp/Snakefile"
+include: "benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/Snakefile"
+include: "benchmarks/Jets-HF/jets/Snakefile"
+include: "benchmarks/Inclusive/dis/Snakefile"
+>>>>>>> master

benchmarks/demp/Snakefile → benchmarks/Exclusive-Diffraction-Tagging/demp/Snakefile

@@ -3,8 +3,8 @@ import os
 #Compile the analysis and plotting scripts
 rule demp_compile:
     input:
-        ROOT_BUILD_DIR_PREFIX + "benchmarks/demp/analysis/demp_analysis_cxx.so",
-        ROOT_BUILD_DIR_PREFIX + "benchmarks/demp/analysis/demp_plots_cxx.so",
+        ROOT_BUILD_DIR_PREFIX + "benchmarks/Exclusive-Diffraction-Tagging/demp/analysis/demp_analysis_cxx.so",
+        ROOT_BUILD_DIR_PREFIX + "benchmarks/Exclusive-Diffraction-Tagging/demp/analysis/demp_plots_cxx.so",
 
 #Process the simulated files based on the user-defined campaign
 rule demp_campaign_reco_get:
@@ -60,8 +60,8 @@ DETECTOR_CONFIG={wildcards.DETECTOR_CONFIG} eicrecon {input} -Ppodio:output_file
 #Process the files (either from the campaign or eicrecon) through the analysis script
 rule demp_analysis:
     input:
-        script="benchmarks/demp/analysis/demp_analysis.cxx",
-        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/demp/analysis/demp_analysis_cxx.so",
+        script="benchmarks/Exclusive-Diffraction-Tagging/demp/analysis/demp_analysis.cxx",
+        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/Exclusive-Diffraction-Tagging/demp/analysis/demp_analysis_cxx.so",
         data="reco/{DETECTOR_CONFIG}/{PREFIX}demp_{EBEAM}on{PBEAM}_{INDEX}.edm4eic.root",
     output:
         config="results/{DETECTOR_CONFIG}/demp/{PREFIX}demp_{EBEAM}on{PBEAM}_{INDEX}/config.json",
@@ -115,8 +115,8 @@ hadd {output.hists} {input}
 #Process the merged file through the plotting script
 rule demp_plots:
     input:
-        script="benchmarks/demp/analysis/demp_plots.cxx",
-        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/demp/analysis/demp_plots_cxx.so",
+        script="benchmarks/Exclusive-Diffraction-Tagging/demp/analysis/demp_plots.cxx",
+        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/Exclusive-Diffraction-Tagging/demp/analysis/demp_plots_cxx.so",
         config="results/{DETECTOR_CONFIG}/demp/{PREFIX}demp_{EBEAM}on{PBEAM}_combined_{NUM_FILES}/config.json",
     output:
         "results/{DETECTOR_CONFIG}/demp/{PREFIX}demp_{EBEAM}on{PBEAM}_combined_{NUM_FILES}/plots.pdf"

benchmarks/demp/config.yml → benchmarks/Exclusive-Diffraction-Tagging/demp/config.yml

@@ -19,4 +19,4 @@ demp:results:
   stage: collect
   needs: ["demp:simulate"]
   script:
-    - collect_tests.py demp
+    - collect_tests.py Exclusive-Diffraction-Tagging/demp

benchmarks/diffractive_vm/Snakefile → benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/Snakefile

@@ -3,8 +3,8 @@ import os
 
 rule diffractive_vm_compile:
     input:
-        ROOT_BUILD_DIR_PREFIX + "benchmarks/diffractive_vm/analysis/diffractive_vm_cxx.so",
-        ROOT_BUILD_DIR_PREFIX + "benchmarks/diffractive_vm/analysis/plot_cxx.so",
+        ROOT_BUILD_DIR_PREFIX + "benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/analysis/diffractive_vm_cxx.so",
+        ROOT_BUILD_DIR_PREFIX + "benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/analysis/plot_cxx.so",
 
 
 rule diffractive_vm_campaign_reco_get:
@@ -53,8 +53,8 @@ DETECTOR_CONFIG={wildcards.DETECTOR_CONFIG} eicrecon {input} -Ppodio:output_file
 
 rule diffractive_vm_analysis:
     input:
-        script="benchmarks/diffractive_vm/analysis/diffractive_vm.cxx",
-        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/diffractive_vm/analysis/diffractive_vm_cxx.so",
+        script="benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/analysis/diffractive_vm.cxx",
+        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/analysis/diffractive_vm_cxx.so",
         data="reco/{DETECTOR_CONFIG}/{SIM}sartre_{PARTICLE}{SUFFIX}.edm4eic.root",
     params:
         EBEAM=18,
@@ -121,8 +121,8 @@ ruleorder: diffractive_vm_combine_sartre > diffractive_vm_analysis
 
 rule diffractive_vm_plots:
     input:
-        script="benchmarks/diffractive_vm/analysis/plot.cxx",
-        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/diffractive_vm/analysis/plot_cxx.so",
+        script="benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/analysis/plot.cxx",
+        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/analysis/plot_cxx.so",
         config="{RESULT_PREFIX}/config.json",
     output:
         "{RESULT_PREFIX}/plots_benchmark-phi-dsigmadt.pdf",

benchmarks/diffractive_vm/config.yml → benchmarks/Exclusive-Diffraction-Tagging/diffractive_vm/config.yml

@@ -23,4 +23,4 @@ diffractive_vm:results:
   stage: collect
   needs: ["diffractive_vm:simulate"]
   script:
-    - collect_tests.py diffractive_vm
+    - collect_tests.py Exclusive-Diffraction-Tagging/diffractive_vm

benchmarks/dvcs/config.yml → benchmarks/Exclusive-Diffraction-Tagging/dvcs/config.yml

@@ -2,7 +2,7 @@ dvcs:compile:
   stage: compile
   extends: .compile_benchmark
   script:
-    - compile_analyses.py dvcs
+    - compile_analyses.py Exclusive-Diffraction-Tagging/dvcs
 
 dvcs:simulate:
   stage: simulate
@@ -11,13 +11,13 @@ dvcs:simulate:
     - phy
   needs: ["dvcs:compile"]
   script:
-    #- bash benchmarks/dvcs/dvcs.sh --all
-    - bash benchmarks/dvcs/dvcs.sh --data-init --sim --rec
+    #- bash benchmarks/Exclusive-Diffraction-Tagging/dvcs/dvcs.sh --all
+    - bash benchmarks/Exclusive-Diffraction-Tagging/dvcs/dvcs.sh --data-init --sim --rec
 
 dvcs:results:
   stage: collect
   needs: ["dvcs:simulate"]
   script:
     - ls -lrth
       #pip install junitparser
-      #- python dvcs/scripts/merge_results.py
+      #- python dvcs/Exclusive-Diffraction-Tagging/scripts/merge_results.py

benchmarks/dvcs/dvcs.sh → benchmarks/Exclusive-Diffraction-Tagging/dvcs/dvcs.sh

@@ -150,7 +150,7 @@ if [[ -n "${DO_ANALYSIS}" || -n "${DO_ALL}" ]] ; then
   mkdir -p results/dvcs
 
   # here you can add as many scripts as you want.
-  root -b -q "benchmarks/dvcs/analysis/dvcs_tests.cxx+(\"${JUGGLER_REC_FILE}\")"
+  root -b -q "benchmarks/Exclusive-Diffraction-Tagging/dvcs/analysis/dvcs_tests.cxx+(\"${JUGGLER_REC_FILE}\")"
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running root script"
     exit 1

benchmarks/dvmp/config.yml → benchmarks/Exclusive-Diffraction-Tagging/dvmp/config.yml

@@ -2,7 +2,7 @@ dvmp:compile:
   stage: compile
   extends: .compile_benchmark
   script:
-    - compile_analyses.py dvmp
+    - compile_analyses.py Exclusive-Diffraction-Tagging/dvmp
 
 dvmp:generate:
   needs: ["dvmp:compile"]
@@ -11,7 +11,7 @@ dvmp:generate:
   stage: generate
   timeout: 1 hours
   script:
-    - run_many.py ./benchmarks/dvmp/gen.sh 
+    - run_many.py ./benchmarks/Exclusive-Diffraction-Tagging/dvmp/gen.sh
           -c jpsi_barrel 
           -e 10x100 
           --decay muon --decay electron
@@ -24,7 +24,7 @@ dvmp:simulate:
   timeout: 2 hour
   script:
     - ls -lrth
-    - run_many.py ./benchmarks/dvmp/dvmp.sh 
+    - run_many.py ./benchmarks/Exclusive-Diffraction-Tagging/dvmp/dvmp.sh
           -c jpsi_barrel 
           -e 10x100 
           --decay muon --decay electron

benchmarks/dvmp/dvmp.sh → benchmarks/Exclusive-Diffraction-Tagging/dvmp/dvmp.sh

@@ -40,7 +40,7 @@ source parse_cmd.sh $@
 ## - RESULTS_PATH:  Path for benchmark output figures and files
 ##
 ## You can read dvmp/env.sh for more in-depth explanations of the variables.
-source benchmarks/dvmp/env.sh
+source benchmarks/Exclusive-Diffraction-Tagging/dvmp/env.sh
 
 ## Get a unique file names based on the configuration options
 GEN_FILE=${INPUT_PATH}/gen-${CONFIG}_${DECAY}_${JUGGLER_N_EVENTS}.hepmc
@@ -119,12 +119,12 @@ EOF
 #cat ${CONFIG}
 
 ## run the analysis script with this configuration
-root -b -q "benchmarks/dvmp/analysis/vm_mass.cxx+(\"${CONFIG}\")"
+root -b -q "benchmarks/Exclusive-Diffraction-Tagging/dvmp/analysis/vm_mass.cxx+(\"${CONFIG}\")"
 if [ "$?" -ne "0" ] ; then
   echo "ERROR running vm_mass script"
   exit 1
 fi
-root -b -q "benchmarks/dvmp/analysis/vm_invar.cxx+(\"${CONFIG}\")"
+root -b -q "benchmarks/Exclusive-Diffraction-Tagging/dvmp/analysis/vm_invar.cxx+(\"${CONFIG}\")"
 if [ "$?" -ne "0" ] ; then
   echo "ERROR running vm_invar script"
   exit 1

benchmarks/dvmp/gen.sh → benchmarks/Exclusive-Diffraction-Tagging/dvmp/gen.sh

@@ -44,7 +44,7 @@ source parse_cmd.sh $@
 ## - TMP_PATH:      Path for temporary data (not exported as artifacts)
 ##
 ## You can read dvmp/env.sh for more in-depth explanations of the variables.
-source benchmarks/dvmp/env.sh
+source benchmarks/Exclusive-Diffraction-Tagging/dvmp/env.sh
 
 ## Get a unique file name prefix based on the configuration options
 GEN_TAG=gen-${CONFIG}_${DECAY}_${JUGGLER_N_EVENTS} ## Generic file prefix

benchmarks/tcs/config.yml → benchmarks/Exclusive-Diffraction-Tagging/tcs/config.yml

@@ -2,7 +2,7 @@ tcs:compile:
   stage: compile
   extends: .compile_benchmark
   script:
-    - compile_analyses.py tcs
+    - compile_analyses.py Exclusive-Diffraction-Tagging/tcs
 
 tcs:simulate:
   stage: simulate
@@ -22,8 +22,8 @@ tcs:simulate:
         PBEAM: 275
         TAG: s800
   script:
-    #- bash benchmarks/tcs/tcs.sh --all --ebeam ${EBEAM} --pbeam ${PBEAM} --tag ${TAG}
-    - bash benchmarks/tcs/tcs.sh --data-init --sim --rec --ebeam ${EBEAM} --pbeam ${PBEAM} --tag ${TAG}
+    #- bash benchmarks/Exclusive-Diffraction-Tagging/tcs/tcs.sh --all --ebeam ${EBEAM} --pbeam ${PBEAM} --tag ${TAG}
+    - bash benchmarks/Exclusive-Diffraction-Tagging/tcs/tcs.sh --data-init --sim --rec --ebeam ${EBEAM} --pbeam ${PBEAM} --tag ${TAG}
 
 tcs:results:
   stage: collect

benchmarks/tcs/tcs.sh → benchmarks/Exclusive-Diffraction-Tagging/tcs/tcs.sh

@@ -170,7 +170,7 @@ if [[ -n "${DO_ANALYSIS}" || -n "${DO_ALL}" ]] ; then
   mkdir -p results/tcs
 
   # here you can add as many scripts as you want.
-  root -b -q "benchmarks/tcs/analysis/tcs_tests.cxx+(\"${JUGGLER_REC_FILE}\")"
+  root -b -q "benchmarks/Exclusive-Diffraction-Tagging/tcs/analysis/tcs_tests.cxx+(\"${JUGGLER_REC_FILE}\")"
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running root script"
     exit 1

benchmarks/u_omega/config.yml → benchmarks/Exclusive-Diffraction-Tagging/u_omega/config.yml

@@ -2,7 +2,7 @@ u_omega:compile:
   stage: compile
   extends: .compile_benchmark
   script:
-    - compile_analyses.py u_omega
+    - compile_analyses.py Exclusive-Diffraction-Tagging/u_omega
 
 u_omega:simulate:
   stage: simulate
@@ -11,8 +11,8 @@ u_omega:simulate:
     - phy
   needs: ["u_omega:compile"]
   script:
-    #- bash benchmarks/u_omega/u_omega.sh --all
-    - bash benchmarks/u_omega/u_omega.sh --data-init --sim --rec
+    #- bash benchmarks/Exclusive-Diffraction-Tagging/u_omega/u_omega.sh --all
+    - bash benchmarks/Exclusive-Diffraction-Tagging/u_omega/u_omega.sh --data-init --sim --rec
 
 u_omega:results:
   stage: collect

benchmarks/dis/Snakefile → benchmarks/Inclusive/dis/Snakefile

@@ -3,15 +3,14 @@ import shutil
 
 rule dis_compile:
     input:
-        ROOT_BUILD_DIR_PREFIX + "benchmarks/dis/analysis/dis_electrons_cxx.so",
-        ROOT_BUILD_DIR_PREFIX + "benchmarks/dis/analysis/jets_cxx.so",
+        ROOT_BUILD_DIR_PREFIX + "benchmarks/Inclusive/dis/analysis/dis_electrons_cxx.so",
 
 
 rule dis_sim:
     input:
         warmup="warmup/{DETECTOR_CONFIG}.edm4hep.root",
     output:
-        "sim/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4hep.root",
+        "sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4hep.root",
     params:
         N_EVENTS=100,
     shell:
@@ -30,9 +29,9 @@ ddsim \
 
 rule dis_reco_eicrecon:
     input:
-        "sim/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4hep.root",
+        "sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4hep.root",
     output:
-        "reco/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
+        "sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
     shell:
         """
 DETECTOR_CONFIG={wildcards.DETECTOR_CONFIG} eicrecon {input} -Ppodio:output_file={output}
@@ -41,16 +40,16 @@ DETECTOR_CONFIG={wildcards.DETECTOR_CONFIG} eicrecon {input} -Ppodio:output_file
 
 rule dis_generate_config:
     input:
-        data="reco/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
+        data="sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
     output:
-        config="results/{DETECTOR_CONFIG}/dis/{EBEAM}on{PBEAM}/minQ2={MINQ2}/config.json",
+        config="results/{DETECTOR_CONFIG}/dis/{EBEAM}on{PBEAM}/minQ2={MINQ2}_config.json",
     shell: """
 cat > {output.config} <<EOF
 {{
   "rec_file": "{input.data}",
   "detector": "{wildcards.DETECTOR_CONFIG}",
-  "output_prefix": "$(dirname "{output.config}")/dis_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}",
-  "results_path": "$(dirname "{output.config}")",
+  "output_prefix": "results/{wildcards.DETECTOR_CONFIG}/dis/{wildcards.EBEAM}on{wildcards.PBEAM}/minQ2={wildcards.MINQ2}/dis_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}",
+  "results_path": "results/{wildcards.DETECTOR_CONFIG}/dis/{wildcards.EBEAM}on{wildcards.PBEAM}/minQ2={wildcards.MINQ2}",
   "ebeam": {wildcards.EBEAM},
   "pbeam": {wildcards.PBEAM},
   "minq2": {wildcards.MINQ2},
@@ -63,10 +62,10 @@ EOF
 
 rule dis_analysis_electrons:
     input:
-        script="benchmarks/dis/analysis/dis_electrons.cxx",
-        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/dis/analysis/dis_electrons_cxx.so",
-        data="reco/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
-        config="results/{DETECTOR_CONFIG}/dis/{EBEAM}on{PBEAM}/minQ2={MINQ2}/config.json",
+        script="benchmarks/Inclusive/dis/analysis/dis_electrons.cxx",
+        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/Inclusive/dis/analysis/dis_electrons_cxx.so",
+        data="sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
+        config="results/{DETECTOR_CONFIG}/dis/{EBEAM}on{PBEAM}/minQ2={MINQ2}_config.json",
     output:
         expand("results/{{DETECTOR_CONFIG}}/dis/{{EBEAM}}on{{PBEAM}}/minQ2={{MINQ2}}/{FILENAME}", FILENAME=[
           "dis_{EBEAM}x{PBEAM}_minQ2={MINQ2}_logQ2_panels.png",
@@ -84,41 +83,35 @@ root -l -b -q '{input.script}+("{input.config}")'
 """
 
 
-rule dis_analysis_jets:
-    input:
-        script="benchmarks/dis/analysis/jets.cxx",
-        script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/dis/analysis/jets_cxx.so",
-        data="reco/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
-        config="results/{DETECTOR_CONFIG}/dis/{EBEAM}on{PBEAM}/minQ2={MINQ2}/config.json",
-    output:
-        results_path=directory("results/{DETECTOR_CONFIG}/dis/{EBEAM}on{PBEAM}/minQ2={MINQ2}/jets"),
-    shell: """
-mkdir {output.results_path}
-root -l -b -q '{input.script}+("{input.config}")'
-"""
-
-
 rule dis_analysis_kinematics_correlations:
     input:
-        data="reco/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
+        data="sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
     output:
         results_path=directory("results/{DETECTOR_CONFIG}/dis/{EBEAM}on{PBEAM}/minQ2={MINQ2}/kinematics_correlations"),
     params:
         N_EVENTS=100
+    wildcard_constraints:
+        EBEAM="\d+",
+        PBEAM="\d+",
+        MINQ2="\d+",
     shell: """
 mkdir {output.results_path}
-python benchmarks/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}
+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}
 """
 
 
 rule dis_analysis_truth_reconstruction:
     input:
-        data="reco/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
+        data="sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
     output:
         results_path=directory("results/{DETECTOR_CONFIG}/dis/{EBEAM}on{PBEAM}/minQ2={MINQ2}/truth_reconstruction"),
     params:
         N_EVENTS=100
+    wildcard_constraints:
+        EBEAM="\d+",
+        PBEAM="\d+",
+        MINQ2="\d+",
     shell: """
 mkdir {output.results_path}
-python benchmarks/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}
+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}
 """