diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fe1892ba1e7a17f9c4a092d408b1eac57efe63b..95d2494ea0db195d3295da216a52fcec4226589a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
default:
timeout: 3 hours
artifacts:
- expire_in: 1 week
+ expire_in: 1 week
paths:
- results/
@@ -31,26 +31,26 @@ stages:
- mkdir -p $(dirname results/datasets/nevents/$DATA)
- echo $DATA
- cat $DATA
- - cat $DATA | grep -v "^\#" | parallel -j $JOBS --colsep "," scripts/count_events.sh {1} {2} {3} | sort | tee results/datasets/nevents/$DATA
-
+ - cat $DATA | grep -v "^\#" | parallel -k --lb -j $JOBS --colsep "," scripts/count_events.sh results/datasets/nevents/$DATA {1} {2} {3}
+ - sort -o results/datasets/nevents/$DATA results/datasets/nevents/$DATA
.timings:
stage: timings
script:
- mc config host add S3 https://dtn01.sdcc.bnl.gov:9000 ${S3_ACCESS_KEY} ${S3_SECRET_KEY}
- - eic-info
- mkdir -p $(dirname results/datasets/timings/$DATA)
- echo $DATA
- export DETECTOR_VERSION=nightly
- export DETECTOR_CONFIG=epic_arches
- - cat results/datasets/nevents/$DATA | grep -v "^\#" | head -n 1 || true
- - cat results/datasets/nevents/$DATA | grep -v "^\#" | head -n 1 | parallel -j 1 --colsep "," scripts/determine_timing.sh {1} {2} {3} || true
- - cat results/datasets/nevents/$DATA | grep -v "^\#" | head -n 1 | parallel -j $JOBS --colsep "," scripts/determine_timing.sh {1} {2} {3} | sort | tee results/datasets/timings/$DATA || true
+ # Use sed '1!d1' instead of head -n 1 to avoid pipefail issues
+ - cat results/datasets/nevents/$DATA | grep -v "^\#" | sed '1!d'
+ - cat results/datasets/nevents/$DATA | grep -v "^\#" | sed '1!d' | parallel -k --lb -j $JOBS --colsep "," scripts/determine_timing.sh results/datasets/timings/$DATA {1} {2} {3}
- echo $DATA
- cat results/datasets/nevents/$DATA
- |
IFS="," read file nevents dt0 dt1 < results/datasets/timings/$DATA
export dt0 dt1
- cat results/datasets/nevents/$DATA | grep -v "^\#" | cat | parallel -j $JOBS --colsep "," scripts/determine_timing.sh {1} {2} {3} | sort | tee results/datasets/timings/$DATA
+ cat results/datasets/nevents/$DATA | grep -v "^\#" | cat | parallel -k --lb -j $JOBS --colsep "," scripts/determine_timing.sh results/datasets/timings/$DATA {1} {2} {3}
+ - sort -o results/datasets/timings/$DATA results/datasets/timings/$DATA
.timings_all:
stage: timings
@@ -61,7 +61,8 @@ stages:
- export DETECTOR_VERSION=nightly
- export DETECTOR_CONFIG=epic_arches
- cat results/datasets/nevents/$DATA | grep -v "^\#"
- - cat results/datasets/nevents/$DATA | grep -v "^\#" | parallel -j 16 --colsep "," scripts/determine_timing.sh {1} {2} {3} | sort | tee results/datasets/timings/$DATA
+ - cat results/datasets/nevents/$DATA | grep -v "^\#" | parallel -k --lb -j $JOBS --colsep "," scripts/determine_timing.sh results/datasets/timings/$DATA {1} {2} {3}
+ - sort -o results/datasets/timings/$DATA results/datasets/timings/$DATA
.collect:
stage: collect
@@ -71,16 +72,16 @@ stages:
include:
- local: 'DIS/config.yml'
- - local: 'EXCLUSIVE/config.yml'
- - local: 'SIDIS/config.yml'
+# - local: 'EXCLUSIVE/config.yml'
+# - local: 'SIDIS/config.yml'
- local: 'SINGLE/config.yml'
- - local: 'SR/config.yml'
+# - local: 'SR/config.yml'
collect:
extends: .collect
needs:
- "DIS:collect"
- - "EXCLUSIVE:collect"
- - "SIDIS:collect"
+# - "EXCLUSIVE:collect"
+# - "SIDIS:collect"
- "SINGLE:collect"
- - "SR:collect"
+# - "SR:collect"
diff --git a/SINGLE/130to177deg/e+.csv b/SINGLE/130to177deg/e+.csv
new file mode 100644
index 0000000000000000000000000000000000000000..6dcf12be6f5ee627388b12a1e512458761f957d5
--- /dev/null
+++ b/SINGLE/130to177deg/e+.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/e+/100MeV/130to177deg/e+_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e+/200MeV/130to177deg/e+_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e+/500MeV/130to177deg/e+_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e+/1GeV/130to177deg/e+_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e+/2GeV/130to177deg/e+_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e+/5GeV/130to177deg/e+_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e+/10GeV/130to177deg/e+_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e+/20GeV/130to177deg/e+_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/130to177deg/e-.csv b/SINGLE/130to177deg/e-.csv
new file mode 100644
index 0000000000000000000000000000000000000000..1ef7f2fbe62934a3ebee63213081e8fd3b886c65
--- /dev/null
+++ b/SINGLE/130to177deg/e-.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/e-/100MeV/130to177deg/e-_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e-/200MeV/130to177deg/e-_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e-/500MeV/130to177deg/e-_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e-/1GeV/130to177deg/e-_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e-/2GeV/130to177deg/e-_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e-/5GeV/130to177deg/e-_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e-/10GeV/130to177deg/e-_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/e-/20GeV/130to177deg/e-_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/130to177deg/gamma.csv b/SINGLE/130to177deg/gamma.csv
new file mode 100644
index 0000000000000000000000000000000000000000..8860e421c3e93e105ae90cf393a323a1650d21b3
--- /dev/null
+++ b/SINGLE/130to177deg/gamma.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/gamma/100MeV/130to177deg/gamma_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/gamma/200MeV/130to177deg/gamma_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/gamma/500MeV/130to177deg/gamma_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/gamma/1GeV/130to177deg/gamma_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/gamma/2GeV/130to177deg/gamma_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/gamma/5GeV/130to177deg/gamma_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/gamma/10GeV/130to177deg/gamma_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/gamma/20GeV/130to177deg/gamma_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/130to177deg/kaon+.csv b/SINGLE/130to177deg/kaon+.csv
new file mode 100644
index 0000000000000000000000000000000000000000..63ac261545f2c14162bc44c571d71c4291deb683
--- /dev/null
+++ b/SINGLE/130to177deg/kaon+.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/kaon+/100MeV/130to177deg/kaon+_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/200MeV/130to177deg/kaon+_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/500MeV/130to177deg/kaon+_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/1GeV/130to177deg/kaon+_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/2GeV/130to177deg/kaon+_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/5GeV/130to177deg/kaon+_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/10GeV/130to177deg/kaon+_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/20GeV/130to177deg/kaon+_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/130to177deg/kaon-.csv b/SINGLE/130to177deg/kaon-.csv
new file mode 100644
index 0000000000000000000000000000000000000000..bd0497c300e667821b244f7c4ba9328ae89dc7f8
--- /dev/null
+++ b/SINGLE/130to177deg/kaon-.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/kaon-/100MeV/130to177deg/kaon-_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/200MeV/130to177deg/kaon-_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/500MeV/130to177deg/kaon-_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/1GeV/130to177deg/kaon-_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/2GeV/130to177deg/kaon-_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/5GeV/130to177deg/kaon-_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/10GeV/130to177deg/kaon-_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/20GeV/130to177deg/kaon-_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/130to177deg/kaon0L.csv b/SINGLE/130to177deg/kaon0L.csv
new file mode 100644
index 0000000000000000000000000000000000000000..8d6d6d7f59da7cebb35ec890df728400feb10342
--- /dev/null
+++ b/SINGLE/130to177deg/kaon0L.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/kaon0L/100MeV/130to177deg/kaon0L_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/200MeV/130to177deg/kaon0L_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/500MeV/130to177deg/kaon0L_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/1GeV/130to177deg/kaon0L_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/2GeV/130to177deg/kaon0L_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/5GeV/130to177deg/kaon0L_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/10GeV/130to177deg/kaon0L_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/20GeV/130to177deg/kaon0L_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/130to177deg/pi+.csv b/SINGLE/130to177deg/pi+.csv
new file mode 100644
index 0000000000000000000000000000000000000000..54f8519193e741df23f2d69b74c0d62a61054e1d
--- /dev/null
+++ b/SINGLE/130to177deg/pi+.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/pi+/100MeV/130to177deg/pi+_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi+/200MeV/130to177deg/pi+_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi+/500MeV/130to177deg/pi+_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi+/1GeV/130to177deg/pi+_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi+/2GeV/130to177deg/pi+_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi+/5GeV/130to177deg/pi+_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi+/10GeV/130to177deg/pi+_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi+/20GeV/130to177deg/pi+_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/130to177deg/pi-.csv b/SINGLE/130to177deg/pi-.csv
new file mode 100644
index 0000000000000000000000000000000000000000..36865dc26cae60542407f0e8c180b4de45855897
--- /dev/null
+++ b/SINGLE/130to177deg/pi-.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/pi-/100MeV/130to177deg/pi-_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi-/200MeV/130to177deg/pi-_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi-/500MeV/130to177deg/pi-_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi-/1GeV/130to177deg/pi-_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi-/2GeV/130to177deg/pi-_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi-/5GeV/130to177deg/pi-_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi-/10GeV/130to177deg/pi-_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi-/20GeV/130to177deg/pi-_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/130to177deg/pi0.csv b/SINGLE/130to177deg/pi0.csv
new file mode 100644
index 0000000000000000000000000000000000000000..0413bde45c5e8ecb0936fd70b32ea6d903bced70
--- /dev/null
+++ b/SINGLE/130to177deg/pi0.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/pi0/100MeV/130to177deg/pi0_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi0/200MeV/130to177deg/pi0_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi0/500MeV/130to177deg/pi0_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi0/1GeV/130to177deg/pi0_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi0/2GeV/130to177deg/pi0_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi0/5GeV/130to177deg/pi0_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi0/10GeV/130to177deg/pi0_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/pi0/20GeV/130to177deg/pi0_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/130to177deg/proton.csv b/SINGLE/130to177deg/proton.csv
new file mode 100644
index 0000000000000000000000000000000000000000..eb626d10aa2aeb5ca16d3a0f8bdcdfbc19dcd1bf
--- /dev/null
+++ b/SINGLE/130to177deg/proton.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/proton/100MeV/130to177deg/proton_100MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/proton/200MeV/130to177deg/proton_200MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/proton/500MeV/130to177deg/proton_500MeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/proton/1GeV/130to177deg/proton_1GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/proton/2GeV/130to177deg/proton_2GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/proton/5GeV/130to177deg/proton_5GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/proton/10GeV/130to177deg/proton_10GeV_130to177deg.steer,1000000,0
+EVGEN/SINGLE/proton/20GeV/130to177deg/proton_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/e+.csv b/SINGLE/3to50deg/e+.csv
new file mode 100644
index 0000000000000000000000000000000000000000..c7d8a93efc3e4c01a44e750728f2a664121f99c2
--- /dev/null
+++ b/SINGLE/3to50deg/e+.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/e+/100MeV/3to50deg/e+_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e+/200MeV/3to50deg/e+_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e+/500MeV/3to50deg/e+_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e+/1GeV/3to50deg/e+_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e+/2GeV/3to50deg/e+_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e+/5GeV/3to50deg/e+_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e+/10GeV/3to50deg/e+_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e+/20GeV/3to50deg/e+_20GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/e-.csv b/SINGLE/3to50deg/e-.csv
new file mode 100644
index 0000000000000000000000000000000000000000..df07c03c9ee5b5938886b177a530aec52a8a76fc
--- /dev/null
+++ b/SINGLE/3to50deg/e-.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/e-/100MeV/3to50deg/e-_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e-/200MeV/3to50deg/e-_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e-/500MeV/3to50deg/e-_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e-/1GeV/3to50deg/e-_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e-/2GeV/3to50deg/e-_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e-/5GeV/3to50deg/e-_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e-/10GeV/3to50deg/e-_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/e-/20GeV/3to50deg/e-_20GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/gamma.csv b/SINGLE/3to50deg/gamma.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e4f34fb21bf4f28bc2560f135ab4c51021451901
--- /dev/null
+++ b/SINGLE/3to50deg/gamma.csv
@@ -0,0 +1,10 @@
+EVGEN/SINGLE/gamma/100MeV/3to50deg/gamma_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/gamma/200MeV/3to50deg/gamma_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/gamma/500MeV/3to50deg/gamma_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/gamma/1GeV/3to50deg/gamma_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/gamma/2GeV/3to50deg/gamma_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/gamma/5GeV/3to50deg/gamma_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/gamma/10GeV/3to50deg/gamma_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/gamma/20GeV/3to50deg/gamma_20GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/gamma/40GeV/3to50deg/gamma_40GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/gamma/60GeV/3to50deg/gamma_60GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/kaon+.csv b/SINGLE/3to50deg/kaon+.csv
new file mode 100644
index 0000000000000000000000000000000000000000..01e53ef9fe7e26a20e13d142bc3a2008a9ee78f9
--- /dev/null
+++ b/SINGLE/3to50deg/kaon+.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/kaon+/100MeV/3to50deg/kaon+_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/200MeV/3to50deg/kaon+_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/500MeV/3to50deg/kaon+_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/1GeV/3to50deg/kaon+_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/2GeV/3to50deg/kaon+_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/5GeV/3to50deg/kaon+_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/10GeV/3to50deg/kaon+_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/20GeV/3to50deg/kaon+_20GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/kaon-.csv b/SINGLE/3to50deg/kaon-.csv
new file mode 100644
index 0000000000000000000000000000000000000000..0b022747cea889e6f5ea5696c6441f7df999dac4
--- /dev/null
+++ b/SINGLE/3to50deg/kaon-.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/kaon-/100MeV/3to50deg/kaon-_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/200MeV/3to50deg/kaon-_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/500MeV/3to50deg/kaon-_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/1GeV/3to50deg/kaon-_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/2GeV/3to50deg/kaon-_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/5GeV/3to50deg/kaon-_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/10GeV/3to50deg/kaon-_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/20GeV/3to50deg/kaon-_20GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/kaon0L.csv b/SINGLE/3to50deg/kaon0L.csv
new file mode 100644
index 0000000000000000000000000000000000000000..2a346a6af94763e4e0504025e03d82e6f79983cf
--- /dev/null
+++ b/SINGLE/3to50deg/kaon0L.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/kaon0L/100MeV/3to50deg/kaon0L_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/200MeV/3to50deg/kaon0L_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/500MeV/3to50deg/kaon0L_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/1GeV/3to50deg/kaon0L_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/2GeV/3to50deg/kaon0L_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/5GeV/3to50deg/kaon0L_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/10GeV/3to50deg/kaon0L_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/20GeV/3to50deg/kaon0L_20GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/pi+.csv b/SINGLE/3to50deg/pi+.csv
new file mode 100644
index 0000000000000000000000000000000000000000..33284f13fc84d4bfd3b0841f0d3120d80fe2c92f
--- /dev/null
+++ b/SINGLE/3to50deg/pi+.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/pi+/100MeV/3to50deg/pi+_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi+/200MeV/3to50deg/pi+_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi+/500MeV/3to50deg/pi+_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi+/1GeV/3to50deg/pi+_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi+/2GeV/3to50deg/pi+_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi+/5GeV/3to50deg/pi+_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi+/10GeV/3to50deg/pi+_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi+/20GeV/3to50deg/pi+_20GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/pi-.csv b/SINGLE/3to50deg/pi-.csv
new file mode 100644
index 0000000000000000000000000000000000000000..57648c14e572e2becd0a41b4fbd6b8e14cfad593
--- /dev/null
+++ b/SINGLE/3to50deg/pi-.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/pi-/100MeV/3to50deg/pi-_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi-/200MeV/3to50deg/pi-_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi-/500MeV/3to50deg/pi-_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi-/1GeV/3to50deg/pi-_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi-/2GeV/3to50deg/pi-_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi-/5GeV/3to50deg/pi-_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi-/10GeV/3to50deg/pi-_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi-/20GeV/3to50deg/pi-_20GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/pi0.csv b/SINGLE/3to50deg/pi0.csv
new file mode 100644
index 0000000000000000000000000000000000000000..761a1fbc3d57313590734316f6ae044cdfb0cec1
--- /dev/null
+++ b/SINGLE/3to50deg/pi0.csv
@@ -0,0 +1,10 @@
+EVGEN/SINGLE/pi0/100MeV/3to50deg/pi0_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi0/200MeV/3to50deg/pi0_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi0/500MeV/3to50deg/pi0_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi0/1GeV/3to50deg/pi0_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi0/2GeV/3to50deg/pi0_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi0/5GeV/3to50deg/pi0_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi0/10GeV/3to50deg/pi0_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi0/20GeV/3to50deg/pi0_20GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi0/40GeV/3to50deg/pi0_40GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/pi0/60GeV/3to50deg/pi0_60GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/3to50deg/proton.csv b/SINGLE/3to50deg/proton.csv
new file mode 100644
index 0000000000000000000000000000000000000000..970e922ef35094a6642b943e752665421b4eb947
--- /dev/null
+++ b/SINGLE/3to50deg/proton.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/proton/100MeV/3to50deg/proton_100MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/proton/200MeV/3to50deg/proton_200MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/proton/500MeV/3to50deg/proton_500MeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/proton/1GeV/3to50deg/proton_1GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/proton/2GeV/3to50deg/proton_2GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/proton/5GeV/3to50deg/proton_5GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/proton/10GeV/3to50deg/proton_10GeV_3to50deg.steer,1000000,0
+EVGEN/SINGLE/proton/20GeV/3to50deg/proton_20GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/e+.csv b/SINGLE/45to135deg/e+.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e6a0dbcc8df392690a0384e3a34ddc54395a4e51
--- /dev/null
+++ b/SINGLE/45to135deg/e+.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/e+/100MeV/45to135deg/e+_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e+/200MeV/45to135deg/e+_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e+/500MeV/45to135deg/e+_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e+/1GeV/45to135deg/e+_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e+/2GeV/45to135deg/e+_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e+/5GeV/45to135deg/e+_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e+/10GeV/45to135deg/e+_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e+/20GeV/45to135deg/e+_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/e-.csv b/SINGLE/45to135deg/e-.csv
new file mode 100644
index 0000000000000000000000000000000000000000..bff20be4a5fcfa9e2c83597ec7024a305742bc86
--- /dev/null
+++ b/SINGLE/45to135deg/e-.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/e-/100MeV/45to135deg/e-_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e-/200MeV/45to135deg/e-_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e-/500MeV/45to135deg/e-_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e-/1GeV/45to135deg/e-_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e-/2GeV/45to135deg/e-_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e-/5GeV/45to135deg/e-_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e-/10GeV/45to135deg/e-_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/e-/20GeV/45to135deg/e-_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/gamma.csv b/SINGLE/45to135deg/gamma.csv
new file mode 100644
index 0000000000000000000000000000000000000000..a3e48c7040fb589f729e624f364d27e61a33c349
--- /dev/null
+++ b/SINGLE/45to135deg/gamma.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/gamma/100MeV/45to135deg/gamma_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/gamma/200MeV/45to135deg/gamma_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/gamma/500MeV/45to135deg/gamma_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/gamma/1GeV/45to135deg/gamma_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/gamma/2GeV/45to135deg/gamma_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/gamma/5GeV/45to135deg/gamma_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/gamma/10GeV/45to135deg/gamma_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/gamma/20GeV/45to135deg/gamma_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/kaon+.csv b/SINGLE/45to135deg/kaon+.csv
new file mode 100644
index 0000000000000000000000000000000000000000..c1824152dfe00552912bc887294812ec3309c843
--- /dev/null
+++ b/SINGLE/45to135deg/kaon+.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/kaon+/100MeV/45to135deg/kaon+_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/200MeV/45to135deg/kaon+_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/500MeV/45to135deg/kaon+_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/1GeV/45to135deg/kaon+_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/2GeV/45to135deg/kaon+_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/5GeV/45to135deg/kaon+_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/10GeV/45to135deg/kaon+_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon+/20GeV/45to135deg/kaon+_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/kaon-.csv b/SINGLE/45to135deg/kaon-.csv
new file mode 100644
index 0000000000000000000000000000000000000000..711e34a2b0bd1f1a8ba12931a3578d1503ea015d
--- /dev/null
+++ b/SINGLE/45to135deg/kaon-.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/kaon-/100MeV/45to135deg/kaon-_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/200MeV/45to135deg/kaon-_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/500MeV/45to135deg/kaon-_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/1GeV/45to135deg/kaon-_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/2GeV/45to135deg/kaon-_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/5GeV/45to135deg/kaon-_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/10GeV/45to135deg/kaon-_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon-/20GeV/45to135deg/kaon-_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/kaon0L.csv b/SINGLE/45to135deg/kaon0L.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e12e7a149b4d3d5e2bb94be135a16f0d9d968748
--- /dev/null
+++ b/SINGLE/45to135deg/kaon0L.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/kaon0L/100MeV/45to135deg/kaon0L_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/200MeV/45to135deg/kaon0L_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/500MeV/45to135deg/kaon0L_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/1GeV/45to135deg/kaon0L_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/2GeV/45to135deg/kaon0L_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/5GeV/45to135deg/kaon0L_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/10GeV/45to135deg/kaon0L_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/kaon0L/20GeV/45to135deg/kaon0L_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/pi+.csv b/SINGLE/45to135deg/pi+.csv
new file mode 100644
index 0000000000000000000000000000000000000000..3954fc198c8322865f2b2d3c27c54e597fe851d7
--- /dev/null
+++ b/SINGLE/45to135deg/pi+.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/pi+/100MeV/45to135deg/pi+_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi+/200MeV/45to135deg/pi+_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi+/500MeV/45to135deg/pi+_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi+/1GeV/45to135deg/pi+_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi+/2GeV/45to135deg/pi+_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi+/5GeV/45to135deg/pi+_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi+/10GeV/45to135deg/pi+_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi+/20GeV/45to135deg/pi+_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/pi-.csv b/SINGLE/45to135deg/pi-.csv
new file mode 100644
index 0000000000000000000000000000000000000000..28d7366f9bd8919b2078ada4fd99866dce51611d
--- /dev/null
+++ b/SINGLE/45to135deg/pi-.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/pi-/100MeV/45to135deg/pi-_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi-/200MeV/45to135deg/pi-_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi-/500MeV/45to135deg/pi-_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi-/1GeV/45to135deg/pi-_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi-/2GeV/45to135deg/pi-_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi-/5GeV/45to135deg/pi-_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi-/10GeV/45to135deg/pi-_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi-/20GeV/45to135deg/pi-_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/pi0.csv b/SINGLE/45to135deg/pi0.csv
new file mode 100644
index 0000000000000000000000000000000000000000..954d29849fe4385f3e1f16a0c007affe7e3d567b
--- /dev/null
+++ b/SINGLE/45to135deg/pi0.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/pi0/100MeV/45to135deg/pi0_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi0/200MeV/45to135deg/pi0_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi0/500MeV/45to135deg/pi0_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi0/1GeV/45to135deg/pi0_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi0/2GeV/45to135deg/pi0_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi0/5GeV/45to135deg/pi0_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi0/10GeV/45to135deg/pi0_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/pi0/20GeV/45to135deg/pi0_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/45to135deg/proton.csv b/SINGLE/45to135deg/proton.csv
new file mode 100644
index 0000000000000000000000000000000000000000..f0da7263e5aaca13d54c1837fc2bd43cef955dd1
--- /dev/null
+++ b/SINGLE/45to135deg/proton.csv
@@ -0,0 +1,8 @@
+EVGEN/SINGLE/proton/100MeV/45to135deg/proton_100MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/proton/200MeV/45to135deg/proton_200MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/proton/500MeV/45to135deg/proton_500MeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/proton/1GeV/45to135deg/proton_1GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/proton/2GeV/45to135deg/proton_2GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/proton/5GeV/45to135deg/proton_5GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/proton/10GeV/45to135deg/proton_10GeV_45to135deg.steer,1000000,0
+EVGEN/SINGLE/proton/20GeV/45to135deg/proton_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/SINGLE_130to177deg.csv b/SINGLE/SINGLE_130to177deg.csv
deleted file mode 100644
index c78b687f8b85f4aa2b52303bec6c077c34bf2c0e..0000000000000000000000000000000000000000
--- a/SINGLE/SINGLE_130to177deg.csv
+++ /dev/null
@@ -1,80 +0,0 @@
-EVGEN/SINGLE/e-/100MeV/130to177deg/e-_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e-/200MeV/130to177deg/e-_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e-/500MeV/130to177deg/e-_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e-/1GeV/130to177deg/e-_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e-/2GeV/130to177deg/e-_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e-/5GeV/130to177deg/e-_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e-/10GeV/130to177deg/e-_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e-/20GeV/130to177deg/e-_20GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e+/100MeV/130to177deg/e+_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e+/200MeV/130to177deg/e+_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e+/500MeV/130to177deg/e+_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e+/1GeV/130to177deg/e+_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e+/2GeV/130to177deg/e+_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e+/5GeV/130to177deg/e+_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e+/10GeV/130to177deg/e+_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/e+/20GeV/130to177deg/e+_20GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi-/100MeV/130to177deg/pi-_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi-/200MeV/130to177deg/pi-_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi-/500MeV/130to177deg/pi-_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi-/1GeV/130to177deg/pi-_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi-/2GeV/130to177deg/pi-_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi-/5GeV/130to177deg/pi-_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi-/10GeV/130to177deg/pi-_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi-/20GeV/130to177deg/pi-_20GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi0/100MeV/130to177deg/pi0_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi0/200MeV/130to177deg/pi0_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi0/500MeV/130to177deg/pi0_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi0/1GeV/130to177deg/pi0_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi0/2GeV/130to177deg/pi0_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi0/5GeV/130to177deg/pi0_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi0/10GeV/130to177deg/pi0_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi0/20GeV/130to177deg/pi0_20GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi+/100MeV/130to177deg/pi+_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi+/200MeV/130to177deg/pi+_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi+/500MeV/130to177deg/pi+_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi+/1GeV/130to177deg/pi+_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi+/2GeV/130to177deg/pi+_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi+/5GeV/130to177deg/pi+_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi+/10GeV/130to177deg/pi+_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/pi+/20GeV/130to177deg/pi+_20GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/100MeV/130to177deg/kaon-_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/200MeV/130to177deg/kaon-_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/500MeV/130to177deg/kaon-_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/1GeV/130to177deg/kaon-_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/2GeV/130to177deg/kaon-_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/5GeV/130to177deg/kaon-_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/10GeV/130to177deg/kaon-_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/20GeV/130to177deg/kaon-_20GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/100MeV/130to177deg/kaon+_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/200MeV/130to177deg/kaon+_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/500MeV/130to177deg/kaon+_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/1GeV/130to177deg/kaon+_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/2GeV/130to177deg/kaon+_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/5GeV/130to177deg/kaon+_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/10GeV/130to177deg/kaon+_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/20GeV/130to177deg/kaon+_20GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/gamma/100MeV/130to177deg/gamma_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/gamma/200MeV/130to177deg/gamma_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/gamma/500MeV/130to177deg/gamma_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/gamma/1GeV/130to177deg/gamma_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/gamma/2GeV/130to177deg/gamma_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/gamma/5GeV/130to177deg/gamma_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/gamma/10GeV/130to177deg/gamma_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/gamma/20GeV/130to177deg/gamma_20GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/proton/100MeV/130to177deg/proton_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/proton/200MeV/130to177deg/proton_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/proton/500MeV/130to177deg/proton_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/proton/1GeV/130to177deg/proton_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/proton/2GeV/130to177deg/proton_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/proton/5GeV/130to177deg/proton_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/proton/10GeV/130to177deg/proton_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/proton/20GeV/130to177deg/proton_20GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/100MeV/130to177deg/kaon0L_100MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/200MeV/130to177deg/kaon0L_200MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/500MeV/130to177deg/kaon0L_500MeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/1GeV/130to177deg/kaon0L_1GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/2GeV/130to177deg/kaon0L_2GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/5GeV/130to177deg/kaon0L_5GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/10GeV/130to177deg/kaon0L_10GeV_130to177deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/20GeV/130to177deg/kaon0L_20GeV_130to177deg.steer,1000000,0
diff --git a/SINGLE/SINGLE_3to50deg.csv b/SINGLE/SINGLE_3to50deg.csv
deleted file mode 100644
index f9df3a7f0bf85889288ba50141a98b5d06093c72..0000000000000000000000000000000000000000
--- a/SINGLE/SINGLE_3to50deg.csv
+++ /dev/null
@@ -1,108 +0,0 @@
-EVGEN/SINGLE/e-/100MeV/3to50deg/e-_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e-/200MeV/3to50deg/e-_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e-/500MeV/3to50deg/e-_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e-/1GeV/3to50deg/e-_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e-/2GeV/3to50deg/e-_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e-/5GeV/3to50deg/e-_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e-/10GeV/3to50deg/e-_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e-/20GeV/3to50deg/e-_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e+/100MeV/3to50deg/e+_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e+/200MeV/3to50deg/e+_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e+/500MeV/3to50deg/e+_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e+/1GeV/3to50deg/e+_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e+/2GeV/3to50deg/e+_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e+/5GeV/3to50deg/e+_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e+/10GeV/3to50deg/e+_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/e+/20GeV/3to50deg/e+_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi-/100MeV/3to50deg/pi-_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi-/200MeV/3to50deg/pi-_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi-/500MeV/3to50deg/pi-_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi-/1GeV/3to50deg/pi-_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi-/2GeV/3to50deg/pi-_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi-/5GeV/3to50deg/pi-_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi-/10GeV/3to50deg/pi-_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi-/20GeV/3to50deg/pi-_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/100MeV/3to50deg/pi0_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/200MeV/3to50deg/pi0_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/500MeV/3to50deg/pi0_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/1GeV/3to50deg/pi0_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/2GeV/3to50deg/pi0_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/5GeV/3to50deg/pi0_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/10GeV/3to50deg/pi0_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/20GeV/3to50deg/pi0_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi+/100MeV/3to50deg/pi+_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi+/200MeV/3to50deg/pi+_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi+/500MeV/3to50deg/pi+_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi+/1GeV/3to50deg/pi+_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi+/2GeV/3to50deg/pi+_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi+/5GeV/3to50deg/pi+_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi+/10GeV/3to50deg/pi+_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi+/20GeV/3to50deg/pi+_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/100MeV/3to50deg/kaon-_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/200MeV/3to50deg/kaon-_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/500MeV/3to50deg/kaon-_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/1GeV/3to50deg/kaon-_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/2GeV/3to50deg/kaon-_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/5GeV/3to50deg/kaon-_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/10GeV/3to50deg/kaon-_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/20GeV/3to50deg/kaon-_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/100MeV/3to50deg/kaon+_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/200MeV/3to50deg/kaon+_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/500MeV/3to50deg/kaon+_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/1GeV/3to50deg/kaon+_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/2GeV/3to50deg/kaon+_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/5GeV/3to50deg/kaon+_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/10GeV/3to50deg/kaon+_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/20GeV/3to50deg/kaon+_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/100MeV/3to50deg/gamma_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/200MeV/3to50deg/gamma_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/500MeV/3to50deg/gamma_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/1GeV/3to50deg/gamma_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/2GeV/3to50deg/gamma_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/5GeV/3to50deg/gamma_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/10GeV/3to50deg/gamma_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/20GeV/3to50deg/gamma_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/proton/100MeV/3to50deg/proton_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/proton/200MeV/3to50deg/proton_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/proton/500MeV/3to50deg/proton_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/proton/1GeV/3to50deg/proton_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/proton/2GeV/3to50deg/proton_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/proton/5GeV/3to50deg/proton_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/proton/10GeV/3to50deg/proton_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/proton/20GeV/3to50deg/proton_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/neutron/100MeV/3to50deg/neutron_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/neutron/200MeV/3to50deg/neutron_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/neutron/500MeV/3to50deg/neutron_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/neutron/1GeV/3to50deg/neutron_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/neutron/2GeV/3to50deg/neutron_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/neutron/5GeV/3to50deg/neutron_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/neutron/10GeV/3to50deg/neutron_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/neutron/20GeV/3to50deg/neutron_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/100MeV/3to50deg/kaon0L_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/200MeV/3to50deg/kaon0L_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/500MeV/3to50deg/kaon0L_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/1GeV/3to50deg/kaon0L_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/2GeV/3to50deg/kaon0L_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/5GeV/3to50deg/kaon0L_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/10GeV/3to50deg/kaon0L_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/20GeV/3to50deg/kaon0L_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu-/100MeV/3to50deg/mu-_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu-/200MeV/3to50deg/mu-_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu-/500MeV/3to50deg/mu-_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu-/1GeV/3to50deg/mu-_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu-/2GeV/3to50deg/mu-_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu-/5GeV/3to50deg/mu-_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu-/10GeV/3to50deg/mu-_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu-/20GeV/3to50deg/mu-_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu+/100MeV/3to50deg/mu+_100MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu+/200MeV/3to50deg/mu+_200MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu+/500MeV/3to50deg/mu+_500MeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu+/1GeV/3to50deg/mu+_1GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu+/2GeV/3to50deg/mu+_2GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu+/5GeV/3to50deg/mu+_5GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu+/10GeV/3to50deg/mu+_10GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/mu+/20GeV/3to50deg/mu+_20GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/40GeV/3to50deg/pi0_40GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/pi0/60GeV/3to50deg/pi0_60GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/40GeV/3to50deg/gamma_40GeV_3to50deg.steer,1000000,0
-EVGEN/SINGLE/gamma/60GeV/3to50deg/gamma_60GeV_3to50deg.steer,1000000,0
diff --git a/SINGLE/SINGLE_45to135deg.csv b/SINGLE/SINGLE_45to135deg.csv
deleted file mode 100644
index dc0e16eed7fe8435fe1f716f8354e0d05b6688c4..0000000000000000000000000000000000000000
--- a/SINGLE/SINGLE_45to135deg.csv
+++ /dev/null
@@ -1,104 +0,0 @@
-EVGEN/SINGLE/e-/100MeV/45to135deg/e-_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e-/200MeV/45to135deg/e-_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e-/500MeV/45to135deg/e-_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e-/1GeV/45to135deg/e-_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e-/2GeV/45to135deg/e-_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e-/5GeV/45to135deg/e-_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e-/10GeV/45to135deg/e-_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e-/20GeV/45to135deg/e-_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e+/100MeV/45to135deg/e+_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e+/200MeV/45to135deg/e+_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e+/500MeV/45to135deg/e+_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e+/1GeV/45to135deg/e+_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e+/2GeV/45to135deg/e+_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e+/5GeV/45to135deg/e+_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e+/10GeV/45to135deg/e+_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/e+/20GeV/45to135deg/e+_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi-/100MeV/45to135deg/pi-_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi-/200MeV/45to135deg/pi-_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi-/500MeV/45to135deg/pi-_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi-/1GeV/45to135deg/pi-_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi-/2GeV/45to135deg/pi-_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi-/5GeV/45to135deg/pi-_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi-/10GeV/45to135deg/pi-_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi-/20GeV/45to135deg/pi-_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi0/100MeV/45to135deg/pi0_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi0/200MeV/45to135deg/pi0_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi0/500MeV/45to135deg/pi0_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi0/1GeV/45to135deg/pi0_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi0/2GeV/45to135deg/pi0_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi0/5GeV/45to135deg/pi0_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi0/10GeV/45to135deg/pi0_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi0/20GeV/45to135deg/pi0_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi+/100MeV/45to135deg/pi+_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi+/200MeV/45to135deg/pi+_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi+/500MeV/45to135deg/pi+_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi+/1GeV/45to135deg/pi+_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi+/2GeV/45to135deg/pi+_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi+/5GeV/45to135deg/pi+_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi+/10GeV/45to135deg/pi+_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/pi+/20GeV/45to135deg/pi+_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/100MeV/45to135deg/kaon-_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/200MeV/45to135deg/kaon-_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/500MeV/45to135deg/kaon-_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/1GeV/45to135deg/kaon-_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/2GeV/45to135deg/kaon-_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/5GeV/45to135deg/kaon-_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/10GeV/45to135deg/kaon-_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon-/20GeV/45to135deg/kaon-_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/100MeV/45to135deg/kaon+_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/200MeV/45to135deg/kaon+_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/500MeV/45to135deg/kaon+_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/1GeV/45to135deg/kaon+_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/2GeV/45to135deg/kaon+_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/5GeV/45to135deg/kaon+_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/10GeV/45to135deg/kaon+_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon+/20GeV/45to135deg/kaon+_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/gamma/100MeV/45to135deg/gamma_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/gamma/200MeV/45to135deg/gamma_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/gamma/500MeV/45to135deg/gamma_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/gamma/1GeV/45to135deg/gamma_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/gamma/2GeV/45to135deg/gamma_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/gamma/5GeV/45to135deg/gamma_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/gamma/10GeV/45to135deg/gamma_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/gamma/20GeV/45to135deg/gamma_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/proton/100MeV/45to135deg/proton_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/proton/200MeV/45to135deg/proton_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/proton/500MeV/45to135deg/proton_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/proton/1GeV/45to135deg/proton_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/proton/2GeV/45to135deg/proton_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/proton/5GeV/45to135deg/proton_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/proton/10GeV/45to135deg/proton_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/proton/20GeV/45to135deg/proton_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/neutron/100MeV/45to135deg/neutron_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/neutron/200MeV/45to135deg/neutron_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/neutron/500MeV/45to135deg/neutron_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/neutron/1GeV/45to135deg/neutron_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/neutron/2GeV/45to135deg/neutron_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/neutron/5GeV/45to135deg/neutron_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/neutron/10GeV/45to135deg/neutron_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/neutron/20GeV/45to135deg/neutron_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/100MeV/45to135deg/kaon0L_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/200MeV/45to135deg/kaon0L_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/500MeV/45to135deg/kaon0L_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/1GeV/45to135deg/kaon0L_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/2GeV/45to135deg/kaon0L_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/5GeV/45to135deg/kaon0L_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/10GeV/45to135deg/kaon0L_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/kaon0L/20GeV/45to135deg/kaon0L_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu-/100MeV/45to135deg/mu-_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu-/200MeV/45to135deg/mu-_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu-/500MeV/45to135deg/mu-_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu-/1GeV/45to135deg/mu-_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu-/2GeV/45to135deg/mu-_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu-/5GeV/45to135deg/mu-_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu-/10GeV/45to135deg/mu-_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu-/20GeV/45to135deg/mu-_20GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu+/100MeV/45to135deg/mu+_100MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu+/200MeV/45to135deg/mu+_200MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu+/500MeV/45to135deg/mu+_500MeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu+/1GeV/45to135deg/mu+_1GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu+/2GeV/45to135deg/mu+_2GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu+/5GeV/45to135deg/mu+_5GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu+/10GeV/45to135deg/mu+_10GeV_45to135deg.steer,1000000,0
-EVGEN/SINGLE/mu+/20GeV/45to135deg/mu+_20GeV_45to135deg.steer,1000000,0
diff --git a/SINGLE/config.yml b/SINGLE/config.yml
index 4ccdf789848a9a9b77237be137702bf7188625df..f741757ef168398feb8f928f1cf7c86752afe33c 100644
--- a/SINGLE/config.yml
+++ b/SINGLE/config.yml
@@ -3,9 +3,15 @@ SINGLE:nevents:
parallel:
matrix:
- DATA:
- - "SINGLE/SINGLE_3to50deg.csv"
- - "SINGLE/SINGLE_45to135deg.csv"
- - "SINGLE/SINGLE_130to177deg.csv"
+ - "SINGLE/3to50deg/e-.csv"
+ - "SINGLE/3to50deg/pi-.csv"
+ - "SINGLE/3to50deg/gamma.csv"
+ - "SINGLE/45to135deg/e-.csv"
+ - "SINGLE/45to135deg/pi-.csv"
+ - "SINGLE/45to135deg/gamma.csv"
+ - "SINGLE/130to177deg/e-.csv"
+ - "SINGLE/130to177deg/pi-.csv"
+ - "SINGLE/130to177deg/gamma.csv"
SINGLE:timings:
extends: .timings_all
@@ -14,9 +20,15 @@ SINGLE:timings:
parallel:
matrix:
- DATA:
- - "SINGLE/SINGLE_3to50deg.csv"
- - "SINGLE/SINGLE_45to135deg.csv"
- - "SINGLE/SINGLE_130to177deg.csv"
+ - "SINGLE/3to50deg/e-.csv"
+ - "SINGLE/3to50deg/pi-.csv"
+ - "SINGLE/3to50deg/gamma.csv"
+ - "SINGLE/45to135deg/e-.csv"
+ - "SINGLE/45to135deg/pi-.csv"
+ - "SINGLE/45to135deg/gamma.csv"
+ - "SINGLE/130to177deg/e-.csv"
+ - "SINGLE/130to177deg/pi-.csv"
+ - "SINGLE/130to177deg/gamma.csv"
SINGLE:collect:
extends: .collect
diff --git a/scripts/count_events.sh b/scripts/count_events.sh
index 35b5264b20d20ee7e436c141c973dcab9a34d419..7bdedf197c82633f04322bfb00a412b6665ef785 100755
--- a/scripts/count_events.sh
+++ b/scripts/count_events.sh
@@ -3,9 +3,10 @@ set -Eu # no pipefail to allow head to cut pipe
trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
IFS=$'\n\t'
-file=${1?Specify filename}
-nevents=${2:-} # allow empty
-n_lines_per_event=${3:-} # allow empty
+out=${1?Specify output}
+file=${2?Specify filename}
+nevents=${3:-} # allow empty
+n_lines_per_event=${4:-} # allow empty
if [[ "${file}" =~ \.hepmc\.gz ]] ; then
GUNZIP=(gunzip -c)
@@ -27,4 +28,4 @@ if [ -z "${n_lines_per_event}" ] ; then
fi
# output
-echo "$file,$nevents,$n_lines_per_event"
+echo "$file,$nevents,$n_lines_per_event" | tee -a "${out}"
diff --git a/scripts/determine_timing.sh b/scripts/determine_timing.sh
index 6eff9b530f7994ad1fb0c9814665e99fadc708b8..2920dae30239b3765eb9c5c63e3444db49cd528e 100755
--- a/scripts/determine_timing.sh
+++ b/scripts/determine_timing.sh
@@ -3,13 +3,14 @@ set -Eu # no pipefail to allow head to cut pipe
trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
IFS=$'\n\t'
-file=${1?Specify filename}
-nevents=${2?Specify nevents}
-n_lines_per_event=${3?Specify n_lines_per_event}
+out=${1?Specify output}
+file=${2?Specify filename}
+nevents=${3?Specify nevents}
+n_lines_per_event=${4?Specify n_lines_per_event}
if [ -n "${dt0:-}" -a -n "${dt1:-}" ] ; then
# reuse if already determined
- echo "$file,$nevents,$dt0,$dt1"
+ echo "$file,$nevents,$dt0,$dt1" | tee -a "${out}"
exit
fi
@@ -36,7 +37,7 @@ if [[ "${file}" =~ \.hepmc$ || "${file}" =~ \.hepmc\.gz$ ]] ; then
fi
# get first lines of hepmc file
- mc cat S3/eictest/ATHENA/${file} | ${GUNZIP[@]} | head -n ${nlines} > ${cifile}
+ mc cat S3/eictest/EPIC/${file} | ${GUNZIP[@]} | head -n ${nlines} > ${cifile}
test -f ${cifile}
# count events
n=$(grep ^E ${cifile} | wc -l)
@@ -50,7 +51,7 @@ if [[ "${file}" =~ \.hepmc$ || "${file}" =~ \.hepmc\.gz$ ]] ; then
elif [[ "${file}" =~ \.steer$ ]] ; then
# get full steer file
- mc cp -q S3/eictest/ATHENA/${file} ${cifile} > /dev/null
+ mc cp -q S3/eictest/EPIC/${file} ${cifile} > /dev/null
test -f ${cifile}
n=$n_events_test
type="single"
@@ -67,13 +68,13 @@ mkdir -p $(dirname ${logfile})
# time for 1 event (first, since will write to S3)
t1=$(date +%s.%N)
-/opt/campaigns/${type}/scripts/run.sh ${cifile} 1 2>&1 > ${logfile}.1
+/opt/campaigns/${type}/scripts/run.sh ${cifile} 1 2>&1 | tee ${logfile}.1
t2=$(date +%s.%N)
dt01=$(echo "scale=5; ($t2-$t1)" | bc -l)
# time for n events (last, so will overwrite 1 event)
t1=$(date +%s.%N)
-/opt/campaigns/${type}/scripts/run.sh ${cifile} ${n} 2>&1 > ${logfile}.n
+/opt/campaigns/${type}/scripts/run.sh ${cifile} ${n} 2>&1 | tee ${logfile}.n
t2=$(date +%s.%N)
dt0n=$(echo "scale=5; ($t2-$t1)" | bc -l)
@@ -82,4 +83,4 @@ dt1=$(echo "scale=5; if($dt0n-$dt01>0.1*$dt01) print(($dt0n-$dt01)/($n-1)) else
dt0=$(echo "scale=5; if($dt01>$dt1) print(($dt01-$dt1)) else print(100)" | bc -l)
# output
-echo "$file,$nevents,$dt0,$dt1"
+echo "$file,$nevents,$dt0,$dt1" | tee -a "${out}"