From def56901ee9259060412ca872af3685d9a54c991 Mon Sep 17 00:00:00 2001
From: Oliver Kirsebom <oliver.kirsebom@gmail.com>
Date: Tue, 6 Feb 2018 14:23:00 -0400
Subject: [PATCH] modified resolution in VKAdd

---
 analysis/VKAdd              | Bin 385176 -> 385184 bytes
 analysis/src/VKBaseData.cpp |  10 +++++++---
 mac/allowed.mac             |  23 ++++++++++++++++------
 mac/electron.mac            |  14 ++++++++++---
 mac/f20scan.mac             |  38 +++++++++++++++++-------------------
 5 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/analysis/VKAdd b/analysis/VKAdd
index 90a79678fd6dfa5cdf8c813e5e4fdc92e932a745..366f7e96aef89b01e88ebc30e27da3eb4d208783 100755
GIT binary patch
delta 23966
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
TY5bZ1*}Qu-fGVC-t#<fda%z}V

delta 23960
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
UNa42x$m0D^19*ooJgs*6UjgHpnE(I)

diff --git a/analysis/src/VKBaseData.cpp b/analysis/src/VKBaseData.cpp
index b150c15..b17b26f 100644
--- a/analysis/src/VKBaseData.cpp
+++ b/analysis/src/VKBaseData.cpp
@@ -10,8 +10,12 @@ VKBaseData::VKBaseData()
  : fAddRes(false)
 {
     // coefficients of the energy-resolution function
-    fP0 = 30.44;
-    fP1 = 4.159;
+
+    //fP0 = 30.44;
+    //fP1 = 17.30;
+
+    fP0 = 0.0;
+    fP1 = 15;  //25.2;
 }
 
 
@@ -97,7 +101,7 @@ void VKBaseData::SampleResolution(Float_t& e)
 {
     if (!fAddRes) return;
     
-    double fwhm = sqrt(pow(fP0,2) + pow(fP1,2) * e);
+    double fwhm = sqrt(pow(fP0,2) + fP1 * e);
     double sigma = fwhm / 2.35;
     
     if (e > 0) e += fRNG -> Gaus(0, sigma);
diff --git a/mac/allowed.mac b/mac/allowed.mac
index ba13730..b805ab0 100644
--- a/mac/allowed.mac
+++ b/mac/allowed.mac
@@ -7,11 +7,11 @@
 # 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
@@ -19,7 +19,7 @@
 # energy spectrum
 /VK/source/betaSpectrum true
 /VK/source/betaEndPoint 5.40 MeV
-/VK/source/betaMinEnergy 5.00 MeV
+/VK/source/betaMinEnergy 0 MeV
 /VK/source/betaMaxEnergy 5.40 MeV
 
 # output 
@@ -28,6 +28,17 @@
 
 # run simulations
 
-/VK/field/maxbfield 0.50 tesla
-/VK/output/openFile output/f20scan/b50/allowed_cut.root                
-/run/beamOn 20000000
+#/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 4.50 MeV
+/VK/field/maxbfield 0.48 tesla
+/VK/output/openFile output/allowed_cut_b48.root                
+/run/beamOn 5000000
+
+#/VK/source/betaMinEnergy 4.50 MeV
+#/VK/field/maxbfield 0.50 tesla
+#/VK/output/openFile output/allowed_cut_b50.root                
+#/run/beamOn 500000
diff --git a/mac/electron.mac b/mac/electron.mac
index fcc7f2a..ca81ece 100644
--- a/mac/electron.mac
+++ b/mac/electron.mac
@@ -22,10 +22,18 @@
 #/gps/energy 975.657 keV
 #/gps/energy 1682.232 keV
 
-/gps/energy 5400 keV
+/gps/energy 7500 keV
 
-/VK/field/maxbfield 0.41 tesla
-/VK/output/openFile output/B41_5.4MeV.root                
+/VK/field/maxbfield 0.54 tesla
+/VK/output/openFile output/B54_7.5MeV.root                
+/run/beamOn 10000
+
+/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
 
 
diff --git a/mac/f20scan.mac b/mac/f20scan.mac
index 411f59b..c1ad572 100644
--- a/mac/f20scan.mac
+++ b/mac/f20scan.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-
@@ -28,30 +28,28 @@
 
 # run simulations
 
-##/VK/field/maxbfield 0.20 tesla
-##/VK/output/openFile output/f20scan/270118/b20.root                
-##/run/beamOn 100000
+/VK/field/maxbfield 0.20 tesla
+/VK/output/openFile output/f20scan/b20.root                
+/run/beamOn 500000
 
-##/VK/field/maxbfield 0.25 tesla
-##/VK/output/openFile output/f20scan/270118/b25.root                
-##/run/beamOn 100000
+/VK/field/maxbfield 0.25 tesla
+/VK/output/openFile output/f20scan/b25.root                
+/run/beamOn 500000
 
-##/VK/field/maxbfield 0.30 tesla
-##/VK/output/openFile output/f20scan/270118/b30.root                
-##/run/beamOn 100000
+/VK/field/maxbfield 0.30 tesla
+/VK/output/openFile output/f20scan/b30.root                
+/run/beamOn 500000
 
-##/VK/field/maxbfield 0.35 tesla
-##/VK/output/openFile output/f20scan/270118/b35.root                
-##/run/beamOn 100000
+/VK/field/maxbfield 0.35 tesla
+/VK/output/openFile output/f20scan/b35.root                
+/run/beamOn 500000
 
 /VK/source/betaMinEnergy 3.5 MeV
-
-#/VK/field/maxbfield 0.40 tesla
-#/VK/output/openFile output/f20scan/270118/b40.root                
-#/run/beamOn 200000
+/VK/field/maxbfield 0.40 tesla
+/VK/output/openFile output/f20scan/b40.root                
+/run/beamOn 500000
 
 /VK/source/betaMinEnergy 4.5 MeV
-
 /VK/field/maxbfield 0.44 tesla
-/VK/output/openFile output/f20scan/270118/b44.root                
-/run/beamOn 500000
+/VK/output/openFile output/f20scan/b44.root                
+/run/beamOn 1000000
-- 
GitLab