From b9d42b98ee1c6ff97ab1b7084c4932809d136fc1 Mon Sep 17 00:00:00 2001
From: Oliver Kirsebom <oliver.kirsebom@gmail.com>
Date: Thu, 22 Feb 2018 06:53:48 -0400
Subject: [PATCH] added some files
---
mac/allowed.mac | 24 +-
mac/b12scan.mac | 73 +-
mac/b12scan_k10.mac | 64 +
mac/bi207.mac | 43 +-
mac/bi207scan1.mac | 65 +
mac/bi207scan2.mac | 65 +
mac/electron.mac | 76 +-
mac/f20scan.mac | 43 +-
mac/f20scan_k10.mac | 54 +
mac/forbidden.mac | 25 +-
mac/n16.mac | 40 +
output/EnergyScan.C | 31 +
res/jyflspec_10-K.3dmap | 301411 ++++++++++++++++
res/{bfield001.3dmap => jyflspec_18-K.3dmap} | 0
src/VKDetectorConstruction.cpp | 5 +-
src/VKPhysicsList.cpp | 9 +-
src/VKRecorderRoot.cpp | 1 +
src/VKTabulatedField3D.cpp | 3 +-
18 files changed, 301856 insertions(+), 176 deletions(-)
create mode 100644 mac/b12scan_k10.mac
create mode 100644 mac/bi207scan1.mac
create mode 100644 mac/bi207scan2.mac
create mode 100644 mac/f20scan_k10.mac
create mode 100644 mac/n16.mac
create mode 100644 output/EnergyScan.C
create mode 100644 res/jyflspec_10-K.3dmap
rename res/{bfield001.3dmap => jyflspec_18-K.3dmap} (100%)
diff --git a/mac/allowed.mac b/mac/allowed.mac
index b805ab0..ab6aec3 100644
--- a/mac/allowed.mac
+++ b/mac/allowed.mac
@@ -18,9 +18,9 @@
# energy spectrum
/VK/source/betaSpectrum true
-/VK/source/betaEndPoint 5.40 MeV
+/VK/source/betaEndPoint 5.391 MeV
/VK/source/betaMinEnergy 0 MeV
-/VK/source/betaMaxEnergy 5.40 MeV
+/VK/source/betaMaxEnergy 5.391 MeV
# output
/VK/output/zeroSuppression true
@@ -28,17 +28,17 @@
# run simulations
-#/VK/source/betaMinEnergy 3.50 MeV
-#/VK/field/maxbfield 0.40 tesla
-#/VK/output/openFile output/allowed_cut_b40.root
-#/run/beamOn 5000000
+/VK/source/betaMinEnergy 0 MeV
+/VK/field/maxbfield 0.30 tesla
+/VK/output/openFile output/allowed_b30.root
+/run/beamOn 100000
-/VK/source/betaMinEnergy 4.50 MeV
-/VK/field/maxbfield 0.48 tesla
-/VK/output/openFile output/allowed_cut_b48.root
-/run/beamOn 5000000
+#/VK/source/betaMinEnergy 5.00 MeV
+#/VK/field/maxbfield 0.48 tesla
+#/VK/output/openFile output/allowed_cut_14mm_b48.root
+#/run/beamOn 1000000
-#/VK/source/betaMinEnergy 4.50 MeV
+#/VK/source/betaMinEnergy 5.00 MeV
#/VK/field/maxbfield 0.50 tesla
-#/VK/output/openFile output/allowed_cut_b50.root
+#/VK/output/openFile output/allowed_cut_14mm_b50.root
#/run/beamOn 500000
diff --git a/mac/b12scan.mac b/mac/b12scan.mac
index 42716b8..9260c8c 100644
--- a/mac/b12scan.mac
+++ b/mac/b12scan.mac
@@ -7,7 +7,7 @@
# source dimensions
/VK/source/diskShapedSource true
/VK/source/innerDiameter 0 cm
-/VK/source/outerDiameter 6 mm
+/VK/source/outerDiameter 9 mm
# radiation
/gps/particle e-
@@ -27,39 +27,38 @@
/VK/storeTrajectoryData false
# run simulations
-/VK/field/maxbfield 0.56 tesla
-/VK/output/openFile output/b12_B0.56T.root
-/run/beamOn 100000
-
-#
-#/VK/field/maxbfield 0.10 tesla
-#/VK/output/openFile output/b12scan/b10.root
-#/run/beamOn 1000000
-#
-#/VK/field/maxbfield 0.20 tesla
-#/VK/output/openFile output/b12scan/b20.root
-#/run/beamOn 1000000
-#
-#/VK/field/maxbfield 0.30 tesla
-#/VK/output/openFile output/b12scan/b30.root
-#/run/beamOn 1000000
-#
-#/VK/field/maxbfield 0.40 tesla
-#/VK/output/openFile output/b12scan/b40.root
-#/run/beamOn 1000000
-#
-#/VK/field/maxbfield 0.45 tesla
-#/VK/output/openFile output/b12scan/b45.root
-#/run/beamOn 1000000
-#
-#/VK/field/maxbfield 0.50 tesla
-#/VK/output/openFile output/b12scan/b50.root
-#/run/beamOn 1000000
-#
-#/VK/field/maxbfield 0.55 tesla
-#/VK/output/openFile output/b12scan/b55.root
-#/run/beamOn 1000000
-#
-#/VK/field/maxbfield 0.60 tesla
-#/VK/output/openFile output/b12scan/b60.root
-#/run/beamOn 1000000
+
+/VK/field/maxbfield 0.2500 tesla
+/VK/output/openFile output/b12scan/9mm_v1/b2500.root
+/run/beamOn 500000
+
+/VK/field/maxbfield 0.3500 tesla
+/VK/output/openFile output/b12scan/9mm_v1/b3500.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 2.5 MeV
+/VK/field/maxbfield 0.4000 tesla
+/VK/output/openFile output/b12scan/9mm_v1/b4000.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 3.5 MeV
+/VK/field/maxbfield 0.4400 tesla
+/VK/output/openFile output/b12scan/9mm_v1/b4400.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 3.5 MeV
+/VK/field/maxbfield 0.4800 tesla
+/VK/output/openFile output/b12scan/9mm_v1/b4800.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 3.5 MeV
+/VK/field/maxbfield 0.5200 tesla
+/VK/output/openFile output/b12scan/9mm_v1/b5200.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 3.5 MeV
+/VK/field/maxbfield 0.5600 tesla
+/VK/output/openFile output/b12scan/9mm_v1/b5600.root
+/run/beamOn 500000
+
+
diff --git a/mac/b12scan_k10.mac b/mac/b12scan_k10.mac
new file mode 100644
index 0000000..e312955
--- /dev/null
+++ b/mac/b12scan_k10.mac
@@ -0,0 +1,64 @@
+
+/control/execute mac/init.mac
+
+# magnetic field strength
+/VK/field/maxbfield 0.48 tesla
+
+# source dimensions
+/VK/source/diskShapedSource true
+/VK/source/innerDiameter 0 cm
+/VK/source/outerDiameter 9 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 0 -299.5 mm
+/gps/ang/type iso
+/gps/ang/mintheta 90 deg
+/gps/ang/maxtheta 180 deg
+
+# energy spectrum
+/VK/source/betaSpectrum true
+/VK/source/betaEndPoint 13.37 MeV
+/VK/source/betaMinEnergy 0.00 MeV
+/VK/source/betaMaxEnergy 13.37 MeV
+
+# output
+/VK/output/zeroSuppression true
+/VK/storeTrajectoryData false
+
+# run simulations
+
+/VK/field/maxbfield 0.2830 tesla
+/VK/output/openFile output/b12scan_k10/9mm_v1/b2830.root
+/run/beamOn 500000
+
+/VK/field/maxbfield 0.3960 tesla
+/VK/output/openFile output/b12scan_k10/9mm_v1/b3960.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 2.5 MeV
+/VK/field/maxbfield 0.4530 tesla
+/VK/output/openFile output/b12scan_k10/9mm_v1/b4530.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 3.5 MeV
+/VK/field/maxbfield 0.4980 tesla
+/VK/output/openFile output/b12scan_k10/9mm_v1/b4980.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 3.5 MeV
+/VK/field/maxbfield 0.5430 tesla
+/VK/output/openFile output/b12scan_k10/9mm_v1/b5430.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 3.5 MeV
+/VK/field/maxbfield 0.5880 tesla
+/VK/output/openFile output/b12scan_k10/9mm_v1/b5880.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 3.5 MeV
+/VK/field/maxbfield 0.6340 tesla
+/VK/output/openFile output/b12scan_k10/9mm_v1/b6340.root
+/run/beamOn 500000
+
+
diff --git a/mac/bi207.mac b/mac/bi207.mac
index 98a3cb6..846b594 100644
--- a/mac/bi207.mac
+++ b/mac/bi207.mac
@@ -4,49 +4,52 @@
# output
/VK/output/zeroSuppression true
-# magnetic field
-/VK/field/maxbfield 0.145 tesla
-
# source dimensions
/VK/source/diskShapedSource true
/VK/source/innerDiameter 0 cm
/VK/source/outerDiameter 3 mm
# radiation generator
-/gps/position 0.1 0 -29.9 cm
+/gps/position 0 0 -29.9 cm
/gps/ang/type iso
/gps/ang/mintheta 90 deg
/gps/ang/maxtheta 180 deg
+# magnetic field
+#/VK/field/maxbfield 0.0993 tesla # K-18
+#/VK/field/maxbfield 0.1560 tesla # K-18
+/VK/field/maxbfield 0.1120 tesla # K-10
+#/VK/field/maxbfield 0.1770 tesla # K-10
+
# 482-keV line
-/gps/energy 481.697 keV
-/VK/output/openFile output/bi207_482_K.root
-/run/beamOn 2000000
+#/gps/energy 481.697 keV
+#/VK/output/openFile output/bi207_482_K.root
+#/run/beamOn 2000000
-/gps/energy 554.4 keV
-/VK/output/openFile output/bi207_482_L.root
-/run/beamOn 1000000
+#/gps/energy 554.4 keV
+#/VK/output/openFile output/bi207_482_L.root
+#/run/beamOn 1000000
# 976-keV line
/gps/energy 975.657 keV
-/VK/output/openFile output/bi207_976_K.root
-/run/beamOn 10000000
+/VK/output/openFile output/bi207_976_K_k10.root
+/run/beamOn 100000
/gps/energy 1048.1 keV
-/VK/output/openFile output/bi207_976_L.root
-/run/beamOn 2000000
+/VK/output/openFile output/bi207_976_L_k10.root
+/run/beamOn 100000
# 1682-keV line
-/gps/energy 1682.232 keV
-/VK/output/openFile output/bi207_1682_K.root
-/run/beamOn 100000
+#/gps/energy 1682.232 keV
+#/VK/output/openFile output/bi207_1682_K_k10.root
+#/run/beamOn 100000
-/gps/energy 1754.4 keV
-/VK/output/openFile output/bi207_1682_L.root
-/run/beamOn 100000
+#/gps/energy 1754.4 keV
+#/VK/output/openFile output/bi207_1682_L_k10.root
+#/run/beamOn 100000
diff --git a/mac/bi207scan1.mac b/mac/bi207scan1.mac
new file mode 100644
index 0000000..41bf3aa
--- /dev/null
+++ b/mac/bi207scan1.mac
@@ -0,0 +1,65 @@
+
+/control/execute mac/init.mac
+
+# output
+/VK/output/zeroSuppression true
+
+# source dimensions
+/VK/source/diskShapedSource true
+/VK/source/innerDiameter 0 cm
+/VK/source/outerDiameter 3 mm
+
+# radiation generator
+/gps/position 0 0 -29.9 cm
+/gps/ang/type iso
+/gps/ang/mintheta 90 deg
+/gps/ang/maxtheta 180 deg
+
+
+
+/gps/energy 975.657 keV
+
+/VK/field/maxbfield 0.09 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b90.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.095 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b95.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.10 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b100.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.105 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b105.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.107 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b107.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.11 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b110.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.112 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b112.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.115 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b115.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.12 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b120.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.125 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b125.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.13 tesla
+/VK/output/openFile output/bi207scan/bi207_976_K_b130.root
+/run/beamOn 10000
+
diff --git a/mac/bi207scan2.mac b/mac/bi207scan2.mac
new file mode 100644
index 0000000..7e3ca9e
--- /dev/null
+++ b/mac/bi207scan2.mac
@@ -0,0 +1,65 @@
+
+/control/execute mac/init.mac
+
+# output
+/VK/output/zeroSuppression true
+
+# source dimensions
+/VK/source/diskShapedSource true
+/VK/source/innerDiameter 0 cm
+/VK/source/outerDiameter 3 mm
+
+# radiation generator
+/gps/position 0 0 -29.9 cm
+/gps/ang/type iso
+/gps/ang/mintheta 90 deg
+/gps/ang/maxtheta 180 deg
+
+
+
+/gps/energy 1682.232 keV
+
+/VK/field/maxbfield 0.14 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b140.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.145 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b145.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.15 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b150.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.155 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b155.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.16 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b160.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.165 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b165.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.17 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b170.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.175 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b175.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.18 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b180.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.185 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b185.root
+/run/beamOn 10000
+
+/VK/field/maxbfield 0.19 tesla
+/VK/output/openFile output/bi207scan/bi207_1682_K_b190.root
+/run/beamOn 10000
+
diff --git a/mac/electron.mac b/mac/electron.mac
index ca81ece..9da6265 100644
--- a/mac/electron.mac
+++ b/mac/electron.mac
@@ -10,83 +10,17 @@
# source dimensions
/VK/source/diskShapedSource true
/VK/source/innerDiameter 0 cm
-/VK/source/outerDiameter 3 mm
+/VK/source/outerDiameter 9 mm
# radiation generator
-/gps/position 0.1 0 -29.9 cm
+/gps/position 0 0 -29.9 cm
/gps/ang/type iso
/gps/ang/mintheta 90 deg
/gps/ang/maxtheta 180 deg
-#/gps/energy 481.697 keV
-#/gps/energy 975.657 keV
-#/gps/energy 1682.232 keV
-
-/gps/energy 7500 keV
-
-/VK/field/maxbfield 0.54 tesla
-/VK/output/openFile output/B54_7.5MeV.root
-/run/beamOn 10000
+/gps/energy 8000 keV
/VK/field/maxbfield 0.56 tesla
-/VK/output/openFile output/B56_7.5MeV.root
-/run/beamOn 10000
-
-/VK/field/maxbfield 0.58 tesla
-/VK/output/openFile output/B58_7.5MeV.root
-/run/beamOn 10000
-
-
-#/VK/field/maxbfield 0.0750 tesla
-#/VK/output/openFile output/scan/e2/bmax0750.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.0800 tesla
-#/VK/output/openFile output/scan/e2/bmax0800.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.0850 tesla
-#/VK/output/openFile output/scan/e2/bmax0850.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.0900 tesla
-#/VK/output/openFile output/scan/e2/bmax0900.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.0950 tesla
-#/VK/output/openFile output/scan/e2/bmax0950.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.1000 tesla
-#/VK/output/openFile output/scan/e2/bmax1000.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.1050 tesla
-#/VK/output/openFile output/scan/e2/bmax1050.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.1100 tesla
-#/VK/output/openFile output/scan/e2/bmax1100.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.1150 tesla
-#/VK/output/openFile output/scan/e2/bmax1150.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.1200 tesla
-#/VK/output/openFile output/scan/e2/bmax1200.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.1250 tesla
-#/VK/output/openFile output/scan/e2/bmax1250.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.1300 tesla
-#/VK/output/openFile output/scan/e2/bmax1300.root
-#/run/beamOn 10000
-
-#/VK/field/maxbfield 0.1350 tesla
-#/VK/output/openFile output/scan/e2/bmax1350.root
-#/run/beamOn 10000
-
+/VK/output/openFile output/b56.root
+/run/beamOn 500
diff --git a/mac/f20scan.mac b/mac/f20scan.mac
index c1ad572..3307991 100644
--- a/mac/f20scan.mac
+++ b/mac/f20scan.mac
@@ -18,9 +18,9 @@
# energy spectrum
/VK/source/betaSpectrum true
-/VK/source/betaEndPoint 5.40 MeV
+/VK/source/betaEndPoint 5.391 MeV
/VK/source/betaMinEnergy 0.00 MeV
-/VK/source/betaMaxEnergy 5.40 MeV
+/VK/source/betaMaxEnergy 5.391 MeV
# output
/VK/output/zeroSuppression true
@@ -28,28 +28,27 @@
# run simulations
-/VK/field/maxbfield 0.20 tesla
-/VK/output/openFile output/f20scan/b20.root
-/run/beamOn 500000
+/VK/field/maxbfield 0.1500 tesla
+/VK/output/openFile output/f20scan/9mm/b1500.root
+/run/beamOn 50000
-/VK/field/maxbfield 0.25 tesla
-/VK/output/openFile output/f20scan/b25.root
-/run/beamOn 500000
+/VK/field/maxbfield 0.2000 tesla
+/VK/output/openFile output/f20scan/9mm/b2000.root
+/run/beamOn 50000
-/VK/field/maxbfield 0.30 tesla
-/VK/output/openFile output/f20scan/b30.root
-/run/beamOn 500000
+/VK/field/maxbfield 0.2500 tesla
+/VK/output/openFile output/f20scan/9mm/b2500.root
+/run/beamOn 50000
-/VK/field/maxbfield 0.35 tesla
-/VK/output/openFile output/f20scan/b35.root
-/run/beamOn 500000
+/VK/field/maxbfield 0.3000 tesla
+/VK/output/openFile output/f20scan/9mm/b3000.root
+/run/beamOn 50000
-/VK/source/betaMinEnergy 3.5 MeV
-/VK/field/maxbfield 0.40 tesla
-/VK/output/openFile output/f20scan/b40.root
-/run/beamOn 500000
+/VK/field/maxbfield 0.3500 tesla
+/VK/output/openFile output/f20scan/9mm/b3500.root
+/run/beamOn 50000
-/VK/source/betaMinEnergy 4.5 MeV
-/VK/field/maxbfield 0.44 tesla
-/VK/output/openFile output/f20scan/b44.root
-/run/beamOn 1000000
+/VK/source/betaMinEnergy 2.5 MeV
+/VK/field/maxbfield 0.4000 tesla
+/VK/output/openFile output/f20scan/9mm/b4000.root
+/run/beamOn 50000
diff --git a/mac/f20scan_k10.mac b/mac/f20scan_k10.mac
new file mode 100644
index 0000000..ed8eadd
--- /dev/null
+++ b/mac/f20scan_k10.mac
@@ -0,0 +1,54 @@
+
+/control/execute mac/init.mac
+
+# magnetic field strength
+/VK/field/maxbfield 0.48 tesla
+
+# source dimensions
+/VK/source/diskShapedSource true
+/VK/source/innerDiameter 0 cm
+/VK/source/outerDiameter 9 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 0 -299.5 mm
+/gps/ang/type iso
+/gps/ang/mintheta 90 deg
+/gps/ang/maxtheta 180 deg
+
+# energy spectrum
+/VK/source/betaSpectrum true
+/VK/source/betaEndPoint 5.391 MeV
+/VK/source/betaMinEnergy 0.00 MeV
+/VK/source/betaMaxEnergy 5.391 MeV
+
+# output
+/VK/output/zeroSuppression true
+/VK/storeTrajectoryData false
+
+# run simulations
+
+/VK/field/maxbfield 0.1700 tesla
+/VK/output/openFile output/f20scan_k10/9mm/b1700.root
+/run/beamOn 500000
+
+/VK/field/maxbfield 0.2260 tesla
+/VK/output/openFile output/f20scan_k10/9mm/b2260.root
+/run/beamOn 500000
+
+/VK/field/maxbfield 0.2830 tesla
+/VK/output/openFile output/f20scan_k10/9mm/b2830.root
+/run/beamOn 500000
+
+/VK/field/maxbfield 0.3390 tesla
+/VK/output/openFile output/f20scan_k10/9mm/b3390.root
+/run/beamOn 500000
+
+/VK/field/maxbfield 0.3960 tesla
+/VK/output/openFile output/f20scan_k10/9mm/b3960.root
+/run/beamOn 500000
+
+/VK/source/betaMinEnergy 2.5 MeV
+/VK/field/maxbfield 0.4530 tesla
+/VK/output/openFile output/f20scan_k10/9mm/b4530.root
+/run/beamOn 500000
diff --git a/mac/forbidden.mac b/mac/forbidden.mac
index b7748e0..12801ce 100644
--- a/mac/forbidden.mac
+++ b/mac/forbidden.mac
@@ -7,25 +7,36 @@
# source dimensions
/VK/source/diskShapedSource true
/VK/source/innerDiameter 0 cm
-/VK/source/outerDiameter 4 mm
+/VK/source/outerDiameter 9 mm
# radiation
/gps/particle e-
-/gps/position 0 0 -30 cm
+/gps/position 0 0 -299.5 mm
/gps/ang/type iso
/gps/ang/mintheta 90 deg
/gps/ang/maxtheta 180 deg
# energy spectrum
/VK/source/betaSpectrum true
-/VK/source/betaEndPoint 7.00 MeV
-/VK/source/betaMinEnergy 5.00 MeV
-/VK/source/betaMaxEnergy 7.00 MeV
+/VK/source/betaEndPoint 7.025 MeV
+/VK/source/betaMinEnergy 0.00 MeV
+/VK/source/betaMaxEnergy 7.025 MeV
# output
/VK/output/zeroSuppression true
/VK/storeTrajectoryData false
-/VK/output/openFile output/f20scan/060118/forbidden.root
+
# run simulation
-/run/beamOn 100000
+
+#/VK/source/betaMinEnergy 5.00 MeV
+##/VK/field/maxbfield 0.48 tesla
+#/VK/field/maxbfield 0.543 tesla
+#/VK/output/openFile output/forbidden_cut5000_b543_k10.root
+#/run/beamOn 1000000
+
+/VK/source/betaMinEnergy 5.00 MeV
+#/VK/field/maxbfield 0.50 tesla
+/VK/field/maxbfield 0.566 tesla
+/VK/output/openFile output/forbidden_cut5000_b566_k10.root
+/run/beamOn 1000000
diff --git a/mac/n16.mac b/mac/n16.mac
new file mode 100644
index 0000000..7357842
--- /dev/null
+++ b/mac/n16.mac
@@ -0,0 +1,40 @@
+
+/control/execute mac/init.mac
+
+# magnetic field strength
+/VK/field/maxbfield 0.48 tesla
+
+# source dimensions
+/VK/source/diskShapedSource true
+/VK/source/innerDiameter 0 cm
+/VK/source/outerDiameter 15 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 0 -299.5 mm
+/gps/ang/type iso
+/gps/ang/mintheta 90 deg
+/gps/ang/maxtheta 180 deg
+
+# energy spectrum
+/VK/source/betaSpectrum true
+/VK/source/betaEndPoint 10.4 MeV
+/VK/source/betaMinEnergy 0.00 MeV
+/VK/source/betaMaxEnergy 10.4 MeV
+
+# output
+/VK/output/zeroSuppression true
+/VK/storeTrajectoryData false
+
+
+# run simulation
+
+/VK/source/betaMinEnergy 5.00 MeV
+/VK/field/maxbfield 0.48 tesla
+/VK/output/openFile output/n16_cut5000_b48.root
+/run/beamOn 100000
+
+/VK/source/betaMinEnergy 5.00 MeV
+/VK/field/maxbfield 0.56 tesla
+/VK/output/openFile output/n16_cut5000_b56.root
+/run/beamOn 100000
diff --git a/output/EnergyScan.C b/output/EnergyScan.C
new file mode 100644
index 0000000..5c8375c
--- /dev/null
+++ b/output/EnergyScan.C
@@ -0,0 +1,31 @@
+
+void EnergyScan(double energy, vector<double> magnet) {
+
+ vector<double> counts;
+
+ for (auto B : magnet) {
+
+ TString fname = Form("B%.0f_%.0fMeV.root", B, energy/1E3);
+ TFile * f = new TFile(fname, "READ");
+
+ TTree * t = (TTree*)f->Get("Detector");
+ TH1D * h = new TH1D("h", "h", 1E4, 0, 1E4);
+
+ t->Draw("EDepV2Front+EDepV2Signal >> h");
+
+ h->Draw();
+ int N = h->Integral(h->FindBin(energy-10.), h->FindBin(energy+10.));
+ cout << Form("B = %.0f gauss, N = %i", B, N) << endl;
+
+ counts.push_back(N);
+ }
+
+ TCanvas * c1 = new TCanvas("c1");
+
+ TGraph * gr = new TGraph(magnet.size(), magnet.data(), counts.data());
+ gr->SetMarkerStyle(20);
+ gr->Draw("APC");
+ gPad->SetTicks();
+
+ c1->