modified resolution in VKAdd

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);

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

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
 
 

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