diff --git a/analysis/VKAdd b/analysis/VKAdd
index 95c13f6c34272a49ed789a761e9c0b386a807ac5..90db4f2610301d8c6da4a51f799431430a8d68dd 100755
Binary files a/analysis/VKAdd and b/analysis/VKAdd differ
diff --git a/analysis/src/VKBaseData.cpp b/analysis/src/VKBaseData.cpp
index f7e1a81b46717842c8a7bd0bb4bc78f7524901b4..e0f4260bc0c880f9d39950fc6294c54f05bbcfd8 100644
--- a/analysis/src/VKBaseData.cpp
+++ b/analysis/src/VKBaseData.cpp
@@ -12,13 +12,13 @@ VKBaseData::VKBaseData()
// coefficients of the energy-resolution function
//Old parameters:
- //fP0 = 30.44;
- //fP1 = 17.30;
- //fTauRel = 0;
+ fP0 = 30.44;
+ fP1 = 17.30;
+ fTauRel = 0;
- fP0 = 0.0;
- fP1 = 5.5;
- fTauRel = 1.93;
+// fP0 = 0.0;
+// fP1 = 20;
+// fTauRel = 0; //1.93;
double emin = -3000;
double emax = 100;
@@ -122,18 +122,26 @@ void VKBaseData::SampleResolution(Float_t& e)
double fwhm = sqrt(pow(fP0,2) + fP1 * e);
double sigma = fwhm / 2.35;
+
+
double tau = sigma * fTauRel;
- // set parameter values
- fRes->SetParameter(0, 0);
- fRes->SetParameter(1, sigma);
- if (fTauRel > 0) {
- fRes->SetParameter(0, tau); // shift function so mean is at zero
- fRes->SetParameter(2, tau);
+ if (tau > 0) {
+ // set parameter values
+ fRes->SetParameter(0, 0);
+ fRes->SetParameter(1, sigma);
+ if (fTauRel > 0) {
+ fRes->SetParameter(0, tau); // shift function so mean is at zero
+ fRes->SetParameter(2, tau);
+ }
+ if (fwhm > 50 && e > 50) {
+ e += fRes->GetRandom();
+ }
}
-
- if (fwhm > 50 && e > 50) {
- e += fRes->GetRandom();
+ else {
+ if (fwhm > 50 && e > 50) {
+ e += fRNG->Gaus(0, sigma);
+ }
}
if (e<=0) e = 0;
diff --git a/mac/allowed.mac b/mac/allowed.mac
index 9a577b881cd18894005d30e021dffc62b0790b82..c67ebaa0ead474ed806b72ff4bda81ea8859022a 100644
--- a/mac/allowed.mac
+++ b/mac/allowed.mac
@@ -7,11 +7,12 @@
# source dimensions
/VK/source/diskShapedSource true
/VK/source/innerDiameter 0 cm
-/VK/source/outerDiameter 9 mm
+/VK/source/outerDiameter 15 mm
+/VK/source/catcherFoilPosition 0 0 -299.5 mm
# radiation
/gps/particle e-
-/gps/position 0 0 -299.5 mm
+/gps/position 0 5 -299.5 mm
/gps/ang/type iso
/gps/ang/mintheta 90 deg
/gps/ang/maxtheta 180 deg
@@ -34,17 +35,7 @@
# run simulations
-/VK/source/betaMinEnergy 0 MeV
-/VK/field/maxbfield 0.30 tesla
-/VK/output/openFile output/allowed_b30.root
-/run/beamOn 100000
-
-#/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 5.00 MeV
-#/VK/field/maxbfield 0.50 tesla
-#/VK/output/openFile output/allowed_cut_14mm_b50.root
-#/run/beamOn 500000
+/VK/source/betaMinEnergy 5.00 MeV
+/VK/field/maxbfield 0.48 tesla
+/VK/output/openFile output/allowed_cut5000_b48.root
+/run/beamOn 1000000
diff --git a/mac/betabgr.mac b/mac/betabgr.mac
new file mode 100644
index 0000000000000000000000000000000000000000..8087e64ae8e5b9c199f7cb2de5d1273f85a15a42
--- /dev/null
+++ b/mac/betabgr.mac
@@ -0,0 +1,67 @@
+
+/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
+/VK/source/catcherFoilPosition 0 0 -299.5 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 5 -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/betaZ 6
+/VK/source/betaA 12
+
+# output
+/VK/output/zeroSuppression true
+/VK/storeTrajectoryData false
+
+# run simulations
+
+
+/VK/source/betaEndPoint 7.50 MeV
+/VK/source/betaMinEnergy 5.0 MeV
+/VK/source/betaMaxEnergy 7.50 MeV
+
+/VK/field/maxbfield 0.4801 tesla
+/VK/output/openFile output/betabgr7.5MeV_b48.root
+/run/beamOn 1000000
+
+/VK/field/maxbfield 0.5000 tesla
+/VK/output/openFile output/betabgr7.5MeV_b50.root
+/run/beamOn 1000000
+
+/VK/field/maxbfield 0.5603 tesla
+/VK/output/openFile output/betabgr7.5MeV_b56.root
+/run/beamOn 1000000
+
+
+/VK/source/betaEndPoint 6.0 MeV
+/VK/source/betaMinEnergy 5.0 MeV
+/VK/source/betaMaxEnergy 6.0 MeV
+
+/VK/field/maxbfield 0.4801 tesla
+/VK/output/openFile output/betabgr6MeV_b48.root
+/run/beamOn 1000000
+
+/VK/field/maxbfield 0.5000 tesla
+/VK/output/openFile output/betabgr6MeV_b50.root
+/run/beamOn 1000000
+
+/VK/field/maxbfield 0.5603 tesla
+/VK/output/openFile output/betabgr6MeV_b56.root
+/run/beamOn 1000000
+
+
+
+
diff --git a/mac/f20scan.mac b/mac/f20scan.mac
index 2333582a8402085679ea351f3ed702fb171b438e..d05253320e146387667f064d76d6de076fb99533 100644
--- a/mac/f20scan.mac
+++ b/mac/f20scan.mac
@@ -37,7 +37,33 @@
# run simulations
+/VK/field/maxbfield 0.1504 tesla
+/VK/output/openFile output/f20scan/15mm_y5mm/b1500.root
+/run/beamOn 5000000
+
/VK/field/maxbfield 0.2000 tesla
/VK/output/openFile output/f20scan/15mm_y5mm/b2000.root
-/run/beamOn 500000
+/run/beamOn 5000000
+
+/VK/field/maxbfield 0.2504 tesla
+/VK/output/openFile output/f20scan/15mm_y5mm/b2500.root
+/run/beamOn 5000000
+
+/VK/field/maxbfield 0.3000 tesla
+/VK/output/openFile output/f20scan/15mm_y5mm/b3000.root
+/run/beamOn 5000000
+
+/VK/field/maxbfield 0.3504 tesla
+/VK/output/openFile output/f20scan/15mm_y5mm/b3500.root
+/run/beamOn 5000000
+
+/VK/source/betaMinEnergy 2.5 MeV
+/VK/field/maxbfield 0.4000 tesla
+/VK/output/openFile output/f20scan/15mm_y5mm/b4000.root
+/run/beamOn 5000000
+
+/VK/source/betaMinEnergy 2.5 MeV
+/VK/field/maxbfield 0.4020 tesla
+/VK/output/openFile output/f20scan/15mm_y5mm/b4020.root
+/run/beamOn 5000000
diff --git a/mac/forbidden.mac b/mac/forbidden.mac
index 472ecd91db01e50ef2cff11b25653ff24baaca19..87f9d918c30ffc5d84ec8ae0b55a8093986c7d60 100644
--- a/mac/forbidden.mac
+++ b/mac/forbidden.mac
@@ -25,13 +25,6 @@
/VK/source/betaMinEnergy 0.00 MeV
/VK/source/betaMaxEnergy 7.025 MeV
-##/VK/source/betaShapeFuncA1 1.0
-##/VK/source/betaShapeFuncA2 80.
-##/VK/source/betaShapeFuncA3 -2.0
-##/VK/source/betaShapeFuncA4 -0.28
-##/VK/source/betaShapeFuncA5 -0.009
-##/VK/source/betaShapeFuncA6 0.0080
-
# output
/VK/output/zeroSuppression true
/VK/storeTrajectoryData false
@@ -40,6 +33,6 @@
# run simulation
/VK/source/betaMinEnergy 5.00 MeV
-/VK/field/maxbfield 0.50 tesla
-/VK/output/openFile output/forbidden_cut5000_b50_shape.root
+/VK/field/maxbfield 0.56 tesla
+/VK/output/openFile output/forbidden_cut5000_b56.root
/run/beamOn 1000000
diff --git a/mac/forbidden_idini.mac b/mac/forbidden_idini.mac
new file mode 100644
index 0000000000000000000000000000000000000000..822c141a8a1f4674ed14d3a220f677eeb98cc459
--- /dev/null
+++ b/mac/forbidden_idini.mac
@@ -0,0 +1,50 @@
+
+/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
+/VK/source/catcherFoilPosition 0 0 -299.5 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 5 -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/betaZ 10
+/VK/source/betaA 20
+/VK/source/betaEndPoint 7.025 MeV
+/VK/source/betaMinEnergy 0.00 MeV
+/VK/source/betaMaxEnergy 7.025 MeV
+
+/VK/source/betaShapeFuncA1 1.00
+/VK/source/betaShapeFuncA2 -0.102
+/VK/source/betaShapeFuncA3 -0.0827
+/VK/source/betaShapeFuncA4 -0.0106
+/VK/source/betaShapeFuncA5 0.00274
+/VK/source/betaShapeFuncA6 0.0000416
+
+# 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/forbidden_cut5000_b48_shape-idini.root
+/run/beamOn 1000000
+
+/VK/source/betaMinEnergy 5.00 MeV
+/VK/field/maxbfield 0.50 tesla
+/VK/output/openFile output/forbidden_cut5000_b50_shape-idini.root
+/run/beamOn 1000000
diff --git a/mac/forbidden_max.mac b/mac/forbidden_max.mac
new file mode 100644
index 0000000000000000000000000000000000000000..c935c4501fa43b10317dd8044bf1e4227888107e
--- /dev/null
+++ b/mac/forbidden_max.mac
@@ -0,0 +1,45 @@
+
+/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
+/VK/source/catcherFoilPosition 0 0 -299.5 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 5 -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/betaZ 10
+/VK/source/betaA 20
+/VK/source/betaEndPoint 7.025 MeV
+/VK/source/betaMinEnergy 0.00 MeV
+/VK/source/betaMaxEnergy 7.025 MeV
+
+/VK/source/betaShapeFuncA1 1.00
+/VK/source/betaShapeFuncA2 1.24
+/VK/source/betaShapeFuncA3 1.19
+/VK/source/betaShapeFuncA4 -0.0816
+/VK/source/betaShapeFuncA5 -0.0595
+/VK/source/betaShapeFuncA6 0.00998
+
+# 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/forbidden_cut5000_b48_shape-max.root
+/run/beamOn 1000000
diff --git a/mac/forbidden_min.mac b/mac/forbidden_min.mac
new file mode 100644
index 0000000000000000000000000000000000000000..13cfc9dfa815edcb6130fdae0b4cb93410f16827
--- /dev/null
+++ b/mac/forbidden_min.mac
@@ -0,0 +1,45 @@
+
+/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
+/VK/source/catcherFoilPosition 0 0 -299.5 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 5 -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/betaZ 10
+/VK/source/betaA 20
+/VK/source/betaEndPoint 7.025 MeV
+/VK/source/betaMinEnergy 0.00 MeV
+/VK/source/betaMaxEnergy 7.025 MeV
+
+/VK/source/betaShapeFuncA1 1.00
+/VK/source/betaShapeFuncA2 0.326
+/VK/source/betaShapeFuncA3 0.318
+/VK/source/betaShapeFuncA4 -0.0325
+/VK/source/betaShapeFuncA5 -0.0185
+/VK/source/betaShapeFuncA6 0.00337
+
+# 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/forbidden_cut5000_b48_shape-min.root
+/run/beamOn 1000000
diff --git a/mac/forbidden_suhonen_IMSRG.mac b/mac/forbidden_suhonen_IMSRG.mac
new file mode 100644
index 0000000000000000000000000000000000000000..501ceb328432f4b480c08e2d3cec1b11601b9be2
--- /dev/null
+++ b/mac/forbidden_suhonen_IMSRG.mac
@@ -0,0 +1,50 @@
+
+/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
+/VK/source/catcherFoilPosition 0 0 -299.5 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 5 -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/betaZ 10
+/VK/source/betaA 20
+/VK/source/betaEndPoint 7.025 MeV
+/VK/source/betaMinEnergy 0.00 MeV
+/VK/source/betaMaxEnergy 7.025 MeV
+
+/VK/source/betaShapeFuncA1 1.00
+/VK/source/betaShapeFuncA2 0.0348
+/VK/source/betaShapeFuncA3 -0.138
+/VK/source/betaShapeFuncA4 -0.00728
+/VK/source/betaShapeFuncA5 0.00429
+/VK/source/betaShapeFuncA6 -0.000163
+
+# 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/forbidden_cut5000_b48_shape-suhonen-IMSRG.root
+/run/beamOn 1000000
+
+/VK/source/betaMinEnergy 5.00 MeV
+/VK/field/maxbfield 0.50 tesla
+/VK/output/openFile output/forbidden_cut5000_b50_shape-suhonen-IMSRG.root
+/run/beamOn 1000000
diff --git a/mac/forbidden_suhonen_USDB.mac b/mac/forbidden_suhonen_USDB.mac
new file mode 100644
index 0000000000000000000000000000000000000000..ee9bcb93f62b3cfba07669fdf3d3e9469516cf1e
--- /dev/null
+++ b/mac/forbidden_suhonen_USDB.mac
@@ -0,0 +1,50 @@
+
+/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
+/VK/source/catcherFoilPosition 0 0 -299.5 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 5 -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/betaZ 10
+/VK/source/betaA 20
+/VK/source/betaEndPoint 7.025 MeV
+/VK/source/betaMinEnergy 0.00 MeV
+/VK/source/betaMaxEnergy 7.025 MeV
+
+/VK/source/betaShapeFuncA1 1.00
+/VK/source/betaShapeFuncA2 0.117
+/VK/source/betaShapeFuncA3 -0.164
+/VK/source/betaShapeFuncA4 -0.00411
+/VK/source/betaShapeFuncA5 0.00510
+/VK/source/betaShapeFuncA6 -0.000258
+
+# 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/forbidden_cut5000_b48_shape-suhonen-USDB.root
+/run/beamOn 1000000
+
+/VK/source/betaMinEnergy 5.00 MeV
+/VK/field/maxbfield 0.50 tesla
+/VK/output/openFile output/forbidden_cut5000_b50_shape-suhonen-USDB.root
+/run/beamOn 1000000
diff --git a/mac/test.mac b/mac/test.mac
index 704fc81d0a7c64f65dd7a556354ca91d8ee65c4d..9cbbfea2bb914d1ca4c7b9bfde3df78ae6e31930 100644
--- a/mac/test.mac
+++ b/mac/test.mac
@@ -19,26 +19,32 @@
# energy spectrum
/VK/source/betaSpectrum true
-/VK/source/betaZ 10
-/VK/source/betaA 20
-/VK/source/betaEndPoint 7.025 MeV
-/VK/source/betaMinEnergy 0.00 MeV
-/VK/source/betaMaxEnergy 7.025 MeV
-
-#/VK/source/betaShapeFuncA1 1.0
-#/VK/source/betaShapeFuncA2 80.
-#/VK/source/betaShapeFuncA3 -2.0
-#/VK/source/betaShapeFuncA4 -0.28
-#/VK/source/betaShapeFuncA5 -0.009
-#/VK/source/betaShapeFuncA6 0.0080
+/VK/source/betaZ 6
+/VK/source/betaA 12
# output
-/VK/output/zeroSuppression false
-/VK/storeTrajectoryData true
+/VK/output/zeroSuppression true
+/VK/storeTrajectoryData false
+
+# run simulations
+
+
+/VK/source/betaEndPoint 6.75 MeV
+/VK/source/betaMinEnergy 5.0 MeV
+/VK/source/betaMaxEnergy 6.75 MeV
+
+/VK/field/maxbfield 0.4801 tesla
+/VK/output/openFile output/betabgr6.75MeV_b48.root
+/run/beamOn 1000000
+
+/VK/field/maxbfield 0.5000 tesla
+/VK/output/openFile output/betabgr6.75MeV_b50.root
+/run/beamOn 1000000
+
+/VK/field/maxbfield 0.5603 tesla
+/VK/output/openFile output/betabgr6.75MeV_b56.root
+/run/beamOn 1000000
+
-# run simulation
-/VK/field/maxbfield 0.48 tesla
-/VK/output/openFile output/test1.root
-/run/beamOn 10000
diff --git a/mac/test2.mac b/mac/test2.mac
new file mode 100644
index 0000000000000000000000000000000000000000..7974a3ce8f87da4ea7588b9f269210097fd93909
--- /dev/null
+++ b/mac/test2.mac
@@ -0,0 +1,38 @@
+
+/control/execute mac/init.mac
+/VK/detector/volumes/betaDetector true
+/VK/detector/volumes/betaDetectorV2 false
+
+# 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
+/VK/source/catcherFoilPosition 0 0 -299.5 mm
+
+# radiation
+/gps/particle e-
+/gps/position 0 5 -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/betaZ 6
+/VK/source/betaA 12
+/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.4801 tesla
+/VK/output/openFile output/b12scan/15mm_y5mm_v1/b4800.root
+/run/beamOn 50000000