diff --git a/analysis/VKAdd b/analysis/VKAdd
index 260f6faa9c359584481ef64f9f129254a80a57e4..0ed82ea52e580552e2df6a8a0edc3567e9601bb2 100755
Binary files a/analysis/VKAdd and b/analysis/VKAdd differ
diff --git a/compile.sh b/compile.sh
index a161863d50ab5a09fe0f210b2e565c6c2de53059..4b7dc36097722c2ff0ad37d06b93287df3ec94e0 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,11 +1,12 @@
 rm -f CMakeCache.txt
 rm -rf CMakeFiles
+rm -rf cotire
 
 #@carbonoli
-#cmake -DCMAKE_BUILD_TYPE=DEBUG -DGeant4_DIR=/home/oliskir/src/geant-4.10/geant4.10.3-install/lib/Geant4-10.3.0 $pwd
+cmake -DCMAKE_BUILD_TYPE=DEBUG -DGeant4_DIR=/home/oliskir/src/geant-4.10/geant4.10.3-install/lib/Geant4-10.3.0 $pwd
 
 #@squamish
-cmake -DCMAKE_BUILD_TYPE=DEBUG -DGeant4_DIR=/home/oliskir/src/geant4/geant4.10.2-install/lib/Geant4-10.2.0 $pwd -DCMAKE_BUILD_TYPE=DEBUG
+#cmake -DCMAKE_BUILD_TYPE=DEBUG -DGeant4_DIR=/home/oliskir/src/geant4/geant4.10.2-install/lib/Geant4-10.2.0 $pwd -DCMAKE_BUILD_TYPE=DEBUG
 
 #@stkernfys
 #cmake -DCMAKE_BUILD_TYPE=DEBUG -DGeant4_DIR=/home/kernadmin/geant4/geant4.10.2-install/lib/Geant4-10.2.2/ $pwd -DCMAKE_BUILD_TYPE=DEBUG
diff --git a/mac/allowed.mac b/mac/allowed.mac
index 0e86e185d24c442b2154ffb8a6f183c1828c0ccd..ba137301a02d9e9727bb30cec307bff8743d8cd3 100644
--- a/mac/allowed.mac
+++ b/mac/allowed.mac
@@ -1,5 +1,5 @@
 
-/control/execute init.mac
+/control/execute mac/init.mac
 
 # magnetic field strength
 /VK/field/maxbfield 0.48 tesla
diff --git a/mac/anygamma.mac b/mac/anygamma.mac
index 6b8786573119bad22776cc4415777585a3564994..a64d5f0da81fa0a35dfa32ef3841fb5f5aec12d8 100644
--- a/mac/anygamma.mac
+++ b/mac/anygamma.mac
@@ -1,5 +1,5 @@
 
-/control/execute init.mac
+/control/execute mac/init.mac
 
 # source dimensions
 /VK/source/diskShapedSource true
diff --git a/mac/betaplus.mac b/mac/betaplus.mac
index 60eb87f8676fad3873262adc0abdea71027305d4..300894e980dfcbd6c7ad577fac96a49b4afbcc01 100644
--- a/mac/betaplus.mac
+++ b/mac/betaplus.mac
@@ -1,5 +1,5 @@
 
-/control/execute init.mac
+/control/execute mac/init.mac
 
 # output 
 /VK/output/zeroSuppression true
diff --git a/mac/bi207.mac b/mac/bi207.mac
index bcd9d59a5545784aee4a34c6b44c9d3e1539ad6a..98a3cb6d3f9bf878283549b2a28df6f95ecb4dcd 100644
--- a/mac/bi207.mac
+++ b/mac/bi207.mac
@@ -1,5 +1,5 @@
 
-/control/execute init.mac
+/control/execute mac/init.mac
 
 # output 
 /VK/output/zeroSuppression true
diff --git a/mac/electron.mac b/mac/electron.mac
index 00811872e9e55f1e4303da35939497f5f74bca5c..ea9387a823c390d960a11de726ae5cb317052b34 100644
--- a/mac/electron.mac
+++ b/mac/electron.mac
@@ -1,5 +1,5 @@
 
-/control/execute init.mac
+/control/execute mac/init.mac
 /VK/eventVerbose 0
 
 # output 
diff --git a/mac/f20scan.mac b/mac/f20scan.mac
index 37ddcdc0dfdb5e268b5432d55e2ac5d8cd63a9fb..444c153b008169472d1ce8bf2496de2f68ed47f2 100644
--- a/mac/f20scan.mac
+++ b/mac/f20scan.mac
@@ -28,6 +28,14 @@
 
 # run simulations
 
+/VK/source/betaMinEnergy 2.00 MeV
+/VK/field/maxbfield 0.308 tesla
+/VK/output/openFile output/b308.root                
+/run/beamOn 50000
+/VK/field/maxbfield 0.300 tesla
+/VK/output/openFile output/b300.root                
+/run/beamOn 50000
+
 ###/VK/field/maxbfield 0.10 tesla
 ###/VK/output/openFile output/f20scan/080617/b10.root                
 ###/run/beamOn 100000
@@ -60,14 +68,14 @@
 ###/VK/output/openFile output/f20scan/080617/b44.root                
 ###/run/beamOn 100000
 
-/VK/field/maxbfield 0.46 tesla
-/VK/output/openFile output/f20scan/080617/b46.root                
-/run/beamOn 1000000
+###/VK/field/maxbfield 0.46 tesla
+###/VK/output/openFile output/f20scan/080617/b46.root                
+###/run/beamOn 1000000
 
-/VK/field/maxbfield 0.48 tesla
-/VK/output/openFile output/f20scan/080617/b48.root                
-/run/beamOn 1000000
+###/VK/field/maxbfield 0.48 tesla
+###/VK/output/openFile output/f20scan/080617/b48.root                
+###/run/beamOn 1000000
 
-/VK/field/maxbfield 0.50 tesla
-/VK/output/openFile output/f20scan/080617/b50.root                
-/run/beamOn 1000000
+###/VK/field/maxbfield 0.50 tesla
+###/VK/output/openFile output/f20scan/080617/b50.root                
+###/run/beamOn 1000000
diff --git a/mac/forbidden.mac b/mac/forbidden.mac
index 64f7eab8e068852f695bfd43903d8b5c020319e6..b7748e0b94c30aef5ea7c061313f2ac591e65c30 100644
--- a/mac/forbidden.mac
+++ b/mac/forbidden.mac
@@ -1,8 +1,8 @@
 
-/control/execute init.mac
+/control/execute mac/init.mac
 
 # magnetic field strength
-/VK/field/maxbfield 0.49 tesla
+/VK/field/maxbfield 0.48 tesla
 
 # source dimensions
 /VK/source/diskShapedSource true
@@ -25,7 +25,7 @@
 # output 
 /VK/output/zeroSuppression true
 /VK/storeTrajectoryData false
-/VK/output/openFile output/f20scan/b49/forbidden.root                
+/VK/output/openFile output/f20scan/060118/forbidden.root                
 
 # run simulation
 /run/beamOn 100000
diff --git a/mac/gamma.mac b/mac/gamma.mac
index 0aec575a3b1e5af68790adcdd21e423243f6b76a..0c896ea5354549a445120efa243544269ab74447 100644
--- a/mac/gamma.mac
+++ b/mac/gamma.mac
@@ -1,5 +1,5 @@
 
-/control/execute init.mac
+/control/execute mac/init.mac
 
 # magnetic field strength
 /VK/field/maxbfield 0.46 tesla
diff --git a/mac/leadBlock.mac b/mac/leadBlock.mac
index ab1c7d98f0823bdcf42b5a807483432549963afd..872ffaea0159d4c73fe511111d724a3c4e294a45 100644
--- a/mac/leadBlock.mac
+++ b/mac/leadBlock.mac
@@ -1,6 +1,6 @@
 
-#/control/execute vis.mac
-/control/execute init.mac
+#/control/execute mac/vis.mac
+/control/execute mac/init.mac
 
 # simplify setup
 /VK/detector/volumes/betaDetector true
diff --git a/mac/muon.mac b/mac/muon.mac
index 2c59909c4fa36a35a6fd30e3864fef9704bde12f..a9f3a2e90dead2f0a518577e48a4bc8330a1d04f 100644
--- a/mac/muon.mac
+++ b/mac/muon.mac
@@ -1,6 +1,6 @@
 
-###/control/execute vis.mac
-/control/execute init.mac
+###/control/execute mac/vis.mac
+/control/execute mac/init.mac
 
 # simplify setup
 /VK/detector/volumes/betaDetector true
diff --git a/mac/n16gs.mac b/mac/n16gs.mac
index 27878a85cb31cf4871607e75664a4b4694900190..98c8fef2ef3282ae4e03e3ed1bb05824d770b343 100644
--- a/mac/n16gs.mac
+++ b/mac/n16gs.mac
@@ -1,5 +1,5 @@
 
-/control/execute init.mac
+/control/execute mac/init.mac
 
 # magnetic field strength
 /VK/field/maxbfield 0.48 tesla
diff --git a/mac/run.mac b/mac/run.mac
index d5365db29f5c2839a7b793173aa5847a4385f326..ed0857c757b50350f71bc54ce7e2145f31fa0df4 100644
--- a/mac/run.mac
+++ b/mac/run.mac
@@ -1,5 +1,5 @@
 
-/control/execute init.mac
+/control/execute mac/init.mac
 
 # output 
 /VK/output/zeroSuppression true