From a6346cd13ef1f3eba30e9c62763706ca64af4dd8 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Sat, 15 Mar 2025 22:46:34 -0500 Subject: [PATCH] fix: /work/eic2 -> /volatile/eic (#139) --- Snakefile | 4 ++-- benchmarks/backgrounds/Snakefile | 4 ++-- benchmarks/backwards_ecal/Snakefile | 6 +++--- benchmarks/tracking_performances_dis/Snakefile | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Snakefile b/Snakefile index 9b230cf9..d645066a 100644 --- a/Snakefile +++ b/Snakefile @@ -60,7 +60,7 @@ def get_remote_path(path): if use_s3: return f"s3https://eics3.sdcc.bnl.gov:9000/eictest/{path}" elif use_xrootd: - return f"root://dtn-eic.jlab.org//work/eic2/{path}" + return f"root://dtn-eic.jlab.org//volatile/eic/{path}" else: raise runtime_exception('Unexpected value for config["remote_provider"]: {config["remote_provider"]}') @@ -74,7 +74,7 @@ rule fetch_epic: cache: True retries: 3 shell: """ -xrdcp --debug 2 root://dtn-eic.jlab.org//work/eic2/{output.filepath} {output.filepath} +xrdcp --debug 2 root://dtn-eic.jlab.org//volatile/eic/{output.filepath} {output.filepath} """ if use_xrootd else """ mc cp S3/eictest/{output.filepath} {output.filepath} """ if use_s3 else f""" diff --git a/benchmarks/backgrounds/Snakefile b/benchmarks/backgrounds/Snakefile index 73221938..b0e85a6d 100644 --- a/benchmarks/backgrounds/Snakefile +++ b/benchmarks/backgrounds/Snakefile @@ -59,10 +59,10 @@ dask worker tcp://$DASK_SCHEDULER --nworkers {threads} --nthreads 1 2>{log.worke WORKER_PID=$! env \ MATPLOTLIBRC={input.matplotlibrc} \ -ELECTRON_BEAM_GAS_GEN=root://dtn-eic.jlab.org//work/eic2/EPIC/EVGEN/BACKGROUNDS/BEAMGAS/electron/GETaLM1.0.0-1.0/10GeV/GETaLM1.0.0-1.0_ElectronBeamGas_10GeV_foam_emin10keV_run001.hepmc3.tree.root \ +ELECTRON_BEAM_GAS_GEN=root://dtn-eic.jlab.org//volatile/eic/EPIC/EVGEN/BACKGROUNDS/BEAMGAS/electron/GETaLM1.0.0-1.0/10GeV/GETaLM1.0.0-1.0_ElectronBeamGas_10GeV_foam_emin10keV_run001.hepmc3.tree.root \ ELECTRON_BEAM_GAS_SIM=$(realpath {input.electron_beam_gas_sim}) \ PHYSICS_PROCESS_SIM=$(realpath {input.physics_signal_sim}) \ -PROTON_BEAM_GAS_GEN=root://dtn-eic.jlab.org//work/eic2/EPIC/EVGEN/BACKGROUNDS/BEAMGAS/proton/pythia8.306-1.0/100GeV/pythia8.306-1.0_ProtonBeamGas_100GeV_run001.hepmc3.tree.root \ +PROTON_BEAM_GAS_GEN=root://dtn-eic.jlab.org//volatile/eic/EPIC/EVGEN/BACKGROUNDS/BEAMGAS/proton/pythia8.306-1.0/100GeV/pythia8.306-1.0_ProtonBeamGas_100GeV_run001.hepmc3.tree.root \ PROTON_BEAM_GAS_SIM=$(realpath {input.proton_beam_gas_sim}) \ OUTPUT_DIR={output} \ python {input.script} diff --git a/benchmarks/backwards_ecal/Snakefile b/benchmarks/backwards_ecal/Snakefile index e81671b0..f51a8407 100644 --- a/benchmarks/backwards_ecal/Snakefile +++ b/benchmarks/backwards_ecal/Snakefile @@ -84,7 +84,7 @@ if config.get("stream_from_xrootd", True) not in [False, "", "0", "false"]: params: search_path=lambda wildcards: f"EPIC/RECO/{wildcards.CAMPAIGN}/epic_craterlake/SINGLE/{wildcards.PARTICLE}/{wildcards.ENERGY}/{wildcards.PHASE_SPACE}/", shell: """ - xrdfs root://dtn-eic.jlab.org/ ls /work/eic2/{params.search_path} \ + xrdfs root://dtn-eic.jlab.org/ ls /volatile/eic/{params.search_path} \ | awk '{{ print "root://dtn-eic.jlab.org/"$1; }}' \ | sort \ > {output} @@ -100,8 +100,8 @@ else: params: search_path=lambda wildcards: f"EPIC/RECO/{wildcards.CAMPAIGN}/epic_craterlake/SINGLE/{wildcards.PARTICLE}/{wildcards.ENERGY}/{wildcards.PHASE_SPACE}/", shell: """ - xrdfs root://dtn-eic.jlab.org/ ls /work/eic2/{params.search_path} \ - | sed -e 's#^/work/eic2/##' \ + xrdfs root://dtn-eic.jlab.org/ ls /volatile/eic/{params.search_path} \ + | sed -e 's#^/volatile/eic/##' \ | sort \ > {output} if [ ! -s {output} ]; then diff --git a/benchmarks/tracking_performances_dis/Snakefile b/benchmarks/tracking_performances_dis/Snakefile index 414a7c86..7b8d74e1 100644 --- a/benchmarks/tracking_performances_dis/Snakefile +++ b/benchmarks/tracking_performances_dis/Snakefile @@ -36,7 +36,7 @@ ddsim \ -v WARNING \ --numberOfEvents {params.N_EVENTS} \ --compactFile $DETECTOR_PATH/{wildcards.DETECTOR_CONFIG}.xml \ - --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_{wildcards.INDEX}.hepmc3.tree.root \ + --inputFiles root://dtn-eic.jlab.org//volatile/eic/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_{wildcards.INDEX}.hepmc3.tree.root \ --outputFile {output} """ -- GitLab