diff --git a/benchmarks/dis/Snakefile b/benchmarks/dis/Snakefile index f4f8d1fe8003e50254af84a1a66b79354c29a25d..cb27e711feeca5a80323c0fe930572cbb8b83a07 100644 --- a/benchmarks/dis/Snakefile +++ b/benchmarks/dis/Snakefile @@ -1,15 +1,5 @@ -import os import shutil -from snakemake.remote.S3 import RemoteProvider as S3RemoteProvider - - -S3 = S3RemoteProvider( - endpoint_url="https://eics3.sdcc.bnl.gov:9000", - access_key_id=os.environ["S3_ACCESS_KEY"], - secret_access_key=os.environ["S3_SECRET_KEY"], -) - rule dis_compile: input: @@ -17,23 +7,13 @@ rule dis_compile: ROOT_BUILD_DIR_PREFIX + "benchmarks/dis/analysis/jets_cxx.so", -rule dis_get: - input: - lambda wildcards: S3.remote(f"eictest/EPIC/EVGEN/DIS/NC/{wildcards.EBEAM}x{wildcards.PBEAM}/minQ2={wildcards.MINQ2}/pythia8NCDIS_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}_beamEffects_xAngle=-0.025_hiDiv_vtxfix_1.hepmc"), - output: - "input/dis/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_vtxfix_1.hepmc", - run: - shutil.move(input[0], output[0]) - - rule dis_sim: input: - hepmc="input/dis/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_vtxfix_1.hepmc", warmup="warmup/{DETECTOR_CONFIG}.edm4hep.root", output: "sim/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4hep.root", params: - N_EVENTS=100 + N_EVENTS=100, shell: """ ddsim \ @@ -43,7 +23,7 @@ ddsim \ -v WARNING \ --numberOfEvents {params.N_EVENTS} \ --compactFile $DETECTOR_PATH/{wildcards.DETECTOR_CONFIG}.xml \ - --inputFiles {input.hepmc} \ + --inputFiles root://dtn-eic.jlab.org//work/eic2/EPIC/EVGEN/DIS/NC/{wildcards.EBEAM}x{wildcards.PBEAM}/minQ2={wildcards.MINQ2}/pythia8NCDIS_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}_beamEffects_xAngle=-0.025_hiDiv_vtxfix_1.hepmc3.tree.root \ --outputFile {output} """ diff --git a/benchmarks/dis/config.yml b/benchmarks/dis/config.yml index 8c61b46fefb0e1d518854a8cf370898f9d51102f..bb68fa08d39260872d6446e8bb21fd6fef6cd7dc 100644 --- a/benchmarks/dis/config.yml +++ b/benchmarks/dis/config.yml @@ -4,29 +4,10 @@ dis:compile: script: - snakemake --cores 1 dis_compile -dis:generate: - stage: generate - extends: .phy_benchmark - needs: ["common:detector", "dis:compile"] - parallel: - matrix: - - EBEAM: 5 - PBEAM: 41 - MINQ2: [1, 10, 100] - - EBEAM: 10 - PBEAM: 100 - MINQ2: [1, 10, 100, 1000] - - EBEAM: 18 - PBEAM: 275 - MINQ2: [1, 10, 100, 1000] - timeout: 1 hours - script: - - snakemake --cores 1 input/dis/pythia8NCDIS_${EBEAM}x${PBEAM}_minQ2=${MINQ2}_beamEffects_xAngle=-0.025_hiDiv_vtxfix_1.hepmc - dis:simulate: stage: simulate extends: .phy_benchmark - needs: ["dis:generate"] + needs: ["common:detector", "dis:compile"] parallel: matrix: - EBEAM: 5