removed temporary changes

mac/SiDet.mac

@@ -19,16 +19,14 @@
 
 # radiation
 /gps/particle e-
-/gps/position 0 0 -299.5 mm
+/gps/position 0 0 27.5 cm
 /gps/ang/type iso
 /gps/ang/mintheta  90 deg
 /gps/ang/maxtheta 180 deg
 
 # energy spectrum
 /VK/source/betaSpectrum true
-/VK/source/betaEndPoint 5.40 MeV
 /VK/source/betaMinEnergy 0.00 MeV
-/VK/source/betaMaxEnergy 5.40 MeV
 
 # output 
 /VK/output/zeroSuppression true
@@ -36,46 +34,22 @@
 
 # run simulations
 
-###/VK/field/maxbfield 0.10 tesla
-###/VK/output/openFile output/f20scan/080617/b10.root                
-###/run/beamOn 100000
-
-###/VK/field/maxbfield 0.15 tesla
-###/VK/output/openFile output/f20scan/080617/b15.root                
-###/run/beamOn 100000
-
-###/VK/field/maxbfield 0.20 tesla
-###/VK/output/openFile output/f20scan/080617/b20.root                
-###/run/beamOn 100000
-
-###/VK/field/maxbfield 0.25 tesla
-###/VK/output/openFile output/f20scan/080617/b25.root                
-###/run/beamOn 100000
-
-###/VK/field/maxbfield 0.30 tesla
-###/VK/output/openFile output/f20scan/080617/b30.root                
-###/run/beamOn 100000
-
-###/VK/field/maxbfield 0.35 tesla
-###/VK/output/openFile output/f20scan/080617/b35.root                
-###/run/beamOn 100000
-
-###/VK/field/maxbfield 0.40 tesla
-###/VK/output/openFile output/f20scan/080617/b40.root                
-###/run/beamOn 100000
-
-###/VK/field/maxbfield 0.44 tesla
-###/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.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/source/betaEndPoint 10.42 MeV
+/VK/source/betaMaxEnergy 10.42 MeV
+/VK/output/openFile output/si_gs.root                
+/run/beamOn 100000
+
+/VK/source/betaEndPoint 4.29 MeV
+/VK/source/betaMaxEnergy 4.29 MeV
+/VK/output/openFile output/si_3m.root                
+/run/beamOn 100000
+
+/VK/source/betaEndPoint 3.30 MeV
+/VK/source/betaMaxEnergy 3.30 MeV
+/VK/output/openFile output/si_1m.root                
+/run/beamOn 100000
+
+/VK/source/betaEndPoint 1.55 MeV
+/VK/source/betaMaxEnergy 1.55 MeV
+/VK/output/openFile output/si_2m.root                
+/run/beamOn 100000

src/VKBetaDetector.cpp

@@ -83,6 +83,7 @@ VKBetaDetector::VKBetaDetector(G4RotationMatrix *pRot,
     // Get materials
     fLabVacuum = fMaterials -> GetMaterial("LABVACUUM"); 
     fEJ200     = fMaterials -> GetMaterial("G4_PLASTIC_SC_VINYLTOLUENE");
+//***    fEJ200     = fMaterials -> GetMaterial("SILICON");
     fTeflon    = fMaterials -> GetMaterial("G4_TEFLON");
     fMylar     = fMaterials -> GetMaterial("G4_MYLAR");
     fGlass     = G4Material::GetMaterial("GLASS"),