Skip to content

Commit bead800

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent f4fe2e2 commit bead800

File tree

78 files changed

+564
-611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+564
-611
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Makefile
2525
cmake_install.cmake
2626
install_manifest.txt
2727

28-
# vim
28+
# vim
2929
~*
3030
*.swp
3131
*.swo

.gitlab-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ default:
2020
tags:
2121
- phy-scratch
2222
artifacts:
23-
expire_in: 72 hours
23+
expire_in: 72 hours
2424
paths:
2525
- .local/detector
2626
- .local/lib
@@ -79,11 +79,11 @@ common:setup:
7979
script:
8080
- |
8181
if [[ "${COMMON_BENCH_VERSION}" == "" ]] ; then
82-
export COMMON_BENCH_VERSION="master"
82+
export COMMON_BENCH_VERSION="master"
8383
fi
84-
echo "COMMON_BENCH_VERSION = ${COMMON_BENCH_VERSION}"
84+
echo "COMMON_BENCH_VERSION = ${COMMON_BENCH_VERSION}"
8585
echo "COMMON_BENCH_VERSION=${COMMON_BENCH_VERSION}" >> .env
86-
git clone -b "${COMMON_BENCH_VERSION}" https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
86+
git clone -b "${COMMON_BENCH_VERSION}" https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
8787
echo "BENCHMARKS_TAG: ${BENCHMARKS_TAG}"
8888
echo "BENCHMARKS_CONTAINER: ${BENCHMARKS_CONTAINER}"
8989
echo "BENCHMARKS_REGISTRY: ${BENCHMARKS_REGISTRY}"
@@ -109,7 +109,7 @@ get_data:
109109
- mc config host add S3 https://eics3.sdcc.bnl.gov:9000 ${S3_ACCESS_KEY} ${S3_SECRET_KEY}
110110
- source .local/bin/env.sh
111111
- source /opt/detector/epic-main/setup.sh
112-
- ls -lrtha
112+
- ls -lrtha
113113
- ln -s "${LOCAL_DATA_PATH}/sim_output" sim_output
114114
- ln -s "${LOCAL_DATA_PATH}/datasets/data" data
115115
# snakemake support
@@ -123,7 +123,7 @@ get_data:
123123
when:
124124
- runner_system_failure
125125

126-
include:
126+
include:
127127
- local: 'benchmarks/backgrounds/config.yml'
128128
- local: 'benchmarks/backwards_ecal/config.yml'
129129
- local: 'benchmarks/ecal_gaps/config.yml'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Detector benchmarks are meant to provide a maintained set of performance plots f
1414

1515
## Adding new benchmarks
1616

17-
To get an idea of what to do look at an existing benchmark in the
17+
To get an idea of what to do look at an existing benchmark in the
1818
[`benchmarks` directory](https://github.com/eic/detector_benchmarks/tree/master/benchmarks).
1919
Currently a good reference for Snakemake instrumentation is available in the `tracking\_performances` benchmark.
2020
It relies on single particle simulations that can be either produced on eicweb or downloaded from official campagins.

benchmarks/b0_tracker/analysis/b0_tracker_hits.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,3 @@ void b0_tracker_hits(const char* fname = "./sim_output/sim_forward_protons.edm4h
5858
//}
5959

6060
}
61-

benchmarks/b0_tracker/config.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ bench:b0_tracker:
1717
results:b0_tracker:
1818
extends: .det_benchmark
1919
stage: collect
20-
needs:
20+
needs:
2121
- ["bench:b0_tracker"]
2222
script:
2323
- echo "Collecting results for B0 Tracker"
24-
25-
26-

benchmarks/b0_tracker/forward_protons.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
22

3-
if [[ ! -n "${DETECTOR}" ]] ; then
3+
if [[ ! -n "${DETECTOR}" ]] ; then
44
export DETECTOR="topside"
55
fi
66

7-
if [[ ! -n "${JUGGLER_N_EVENTS}" ]] ; then
7+
if [[ ! -n "${JUGGLER_N_EVENTS}" ]] ; then
88
export JUGGLER_N_EVENTS=100
99
fi
1010

@@ -47,4 +47,3 @@ if [[ "$?" -ne "0" ]] ; then
4747
echo "ERROR running script: events"
4848
exit 1
4949
fi
50-

benchmarks/b0_tracker/scripts/gen_forward_protons.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ using namespace HepMC3;
2121
/** Generate electrons in the central region.
2222
* This is for testing detectors in the "barrel" region.
2323
*/
24-
void gen_forward_protons(int n_events = 100,
24+
void gen_forward_protons(int n_events = 100,
2525
const char* out_fname = "forward_protons.hepmc")
2626
{
2727
double cos_theta_min = std::cos(0.5*(M_PI/180.0));

benchmarks/backwards_ecal/backwards_ecal.org

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ vector.register_awkward()
2727
#+end_src
2828

2929
* Plotting setup
30-
30+
3131
#+begin_src jupyter-python :results silent
3232
import matplotlib as mpl
3333
import matplotlib.pyplot as plt
34-
34+
3535
def setup_presentation_style():
3636
mpl.rcParams.update(mpl.rcParamsDefault)
3737
plt.style.use('ggplot')
@@ -49,7 +49,7 @@ def setup_presentation_style():
4949
})
5050

5151
setup_presentation_style()
52-
#+end_src
52+
#+end_src
5353

5454
* Parameters
5555

benchmarks/barrel_ecal/config.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ bench:emcal_barrel_pion_rejection:
9494
collect_results:barrel_ecal:
9595
extends: .det_benchmark
9696
stage: collect
97-
needs:
97+
needs:
9898
- "calib:emcal_barrel_electrons"
9999
- "bench:emcal_barrel_electrons_scan"
100100
- "bench:emcal_barrel_photons"
@@ -103,5 +103,4 @@ collect_results:barrel_ecal:
103103
- "bench:emcal_barrel_pion_rejection"
104104
script:
105105
- ls -lrht
106-
- echo " FIX ME"
107-
106+
- echo " FIX ME"

benchmarks/barrel_ecal/run_emcal_barrel_energy_scan.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ E_file="sim_output/emcal_barrel_energy_scan_points_${PARTICLE}.txt"
55

66
MIN_N_EVENTS=750
77
if (( $JUGGLER_N_EVENTS < $MIN_N_EVENTS )); then
8-
ORIGINAL_JUGGLER_N_EVENTS=$JUGGLER_N_EVENTS
8+
ORIGINAL_JUGGLER_N_EVENTS=$JUGGLER_N_EVENTS
99
export JUGGLER_N_EVENTS=$MIN_N_EVENTS
1010
echo "Setting JUGGLER_N_EVENTS to ${MIN_N_EVENTS}"
1111
fi
1212
#0.5 1 2 3 4 7 15 20
1313
for E in 0.5 1 2 5 10
1414
do
1515
export E_START="$E"
16-
export E_END="$E"
16+
export E_END="$E"
1717
bash benchmarks/barrel_ecal/run_emcal_barrel_particles.sh "${PARTICLE}" && echo "$E" >> "$E_file" || exit 1
1818
path_rootfiles="sim_output/energy_scan/${E}/"
1919
path_plots="results/energy_scan/${E}/"

0 commit comments

Comments
 (0)