diff --git a/VeikonKone.dox b/VeikonKone.dox index 6af4a560a0dbddd1861f60537903b95487fd7018..8070a26a6049df8a48d638e88b94f2c767085dc6 100644 --- a/VeikonKone.dox +++ b/VeikonKone.dox @@ -753,7 +753,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = /home/oliskir/Desktop/F20/sim/VeikonKone/include/ +INPUT = /home/oliskir/Nuclear/Projects/IGISOL/F20/sim/VeikonKone/include/ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/mac/forbidden.mac b/mac/forbidden.mac index 87f9d918c30ffc5d84ec8ae0b55a8093986c7d60..b22d456743c5430ca06b75bdd26d4a93d52abf28 100644 --- a/mac/forbidden.mac +++ b/mac/forbidden.mac @@ -25,6 +25,9 @@ /VK/source/betaMinEnergy 0.00 MeV /VK/source/betaMaxEnergy 7.025 MeV +/VK/source/betaSpectrum true + + # output /VK/output/zeroSuppression true /VK/storeTrajectoryData false @@ -32,6 +35,16 @@ # run simulation +/VK/source/betaMinEnergy 5.00 MeV +/VK/field/maxbfield 0.48 tesla +/VK/output/openFile output/forbidden_cut5000_b48.root +/run/beamOn 1000000 + +/VK/source/betaMinEnergy 5.00 MeV +/VK/field/maxbfield 0.50 tesla +/VK/output/openFile output/forbidden_cut5000_b50.root +/run/beamOn 1000000 + /VK/source/betaMinEnergy 5.00 MeV /VK/field/maxbfield 0.56 tesla /VK/output/openFile output/forbidden_cut5000_b56.root diff --git a/mac/forbidden_dag_final-1.mac b/mac/forbidden_dag_final-1.mac index ed93b2b45f730fc4bb5e81744784852de38a6ab0..50d59922a3d378466f39b4b6dd53397839ab3876 100644 --- a/mac/forbidden_dag_final-1.mac +++ b/mac/forbidden_dag_final-1.mac @@ -32,6 +32,9 @@ /VK/source/betaShapeFuncA5 -0.004433 /VK/source/betaShapeFuncA6 0.001540 +/VK/source/betaSpectrum true + + # output /VK/output/zeroSuppression true /VK/storeTrajectoryData false diff --git a/mac/forbidden_dag_final-2.mac b/mac/forbidden_dag_final-2.mac index a91a71cba8dc88c2b85267d645d211f5369bb5bd..94b93200e6edd385c37c3dc2d0348a57e0e7a235 100644 --- a/mac/forbidden_dag_final-2.mac +++ b/mac/forbidden_dag_final-2.mac @@ -32,6 +32,9 @@ /VK/source/betaShapeFuncA5 -0.004527 /VK/source/betaShapeFuncA6 0.001200 +/VK/source/betaSpectrum true + + # output /VK/output/zeroSuppression true /VK/storeTrajectoryData false diff --git a/mac/forbidden_dag_final-3.mac b/mac/forbidden_dag_final-3.mac index b6758ca7d60454affb114db799754eecc3f8e8c9..ea80f9d4a8b381fd4b86907d18c05e0c09d7c7c8 100644 --- a/mac/forbidden_dag_final-3.mac +++ b/mac/forbidden_dag_final-3.mac @@ -32,6 +32,9 @@ /VK/source/betaShapeFuncA5 -0.01317 /VK/source/betaShapeFuncA6 0.0008100 +/VK/source/betaSpectrum true + + # output /VK/output/zeroSuppression true /VK/storeTrajectoryData false diff --git a/mac/forbidden_dag_final-4.mac b/mac/forbidden_dag_final-4.mac index 00d2c602c48abc042c0e5906034c5cb32fb66df9..314b575ef525faf068d033252deea2ed64d988ba 100644 --- a/mac/forbidden_dag_final-4.mac +++ b/mac/forbidden_dag_final-4.mac @@ -32,6 +32,9 @@ /VK/source/betaShapeFuncA5 -0.01066 /VK/source/betaShapeFuncA6 0.0006468 +/VK/source/betaSpectrum true + + # output /VK/output/zeroSuppression true /VK/storeTrajectoryData false diff --git a/mac/forbidden_dag_final-5.mac b/mac/forbidden_dag_final-5.mac index 7a41e3a63c5698643493533ff87c234b640c19bb..ef2ed0340fea99ae09398276295fdfbc9cb1dc1f 100644 --- a/mac/forbidden_dag_final-5.mac +++ b/mac/forbidden_dag_final-5.mac @@ -26,11 +26,11 @@ /VK/source/betaMaxEnergy 7.025 MeV /VK/source/betaShapeFuncA1 1.00 -/VK/source/betaShapeFuncA2 -0.02572 -/VK/source/betaShapeFuncA3 -0.3697 -/VK/source/betaShapeFuncA4 0.08748 -/VK/source/betaShapeFuncA5 -0.01075 -/VK/source/betaShapeFuncA6 0.0006531 +/VK/source/betaShapeFuncA2 0.01847 +/VK/source/betaShapeFuncA3 -0.1045 +/VK/source/betaShapeFuncA4 0.01239 +/VK/source/betaShapeFuncA5 -0.005159 +/VK/source/betaShapeFuncA6 0.002043 # output /VK/output/zeroSuppression true diff --git a/mac/forbidden_dag_final-6.mac b/mac/forbidden_dag_final-6.mac index b81add223f6f86a7d2dd78e18e848ef3c2d65ccf..f2b7d808315095abba6bb2ed4c637806f0106ce0 100644 --- a/mac/forbidden_dag_final-6.mac +++ b/mac/forbidden_dag_final-6.mac @@ -26,11 +26,11 @@ /VK/source/betaMaxEnergy 7.025 MeV /VK/source/betaShapeFuncA1 1.00 -/VK/source/betaShapeFuncA2 -0.02876 -/VK/source/betaShapeFuncA3 -0.3504 -/VK/source/betaShapeFuncA4 0.07935 -/VK/source/betaShapeFuncA5 -0.009422 -/VK/source/betaShapeFuncA6 0.0005710 +/VK/source/betaShapeFuncA2 0.02732 +/VK/source/betaShapeFuncA3 -0.01976 +/VK/source/betaShapeFuncA4 0.03038 +/VK/source/betaShapeFuncA5 -0.004414 +/VK/source/betaShapeFuncA6 0.001501 # output /VK/output/zeroSuppression true diff --git a/src/VKPrimaryGeneratorAction.cpp b/src/VKPrimaryGeneratorAction.cpp index 5f7870e4644f76ee4d7f338b75cdad1e60da4d50..e9e0320078d56fdeb56a9e330a4206016cbc0ef9 100644 --- a/src/VKPrimaryGeneratorAction.cpp +++ b/src/VKPrimaryGeneratorAction.cpp @@ -267,7 +267,7 @@ void VKPrimaryGeneratorAction::InitBetaSpectrum() fBetaSpectrumFunc = new TF1("betaSpectrum", fBetaSpectrum, &VKBetaSpectrum::Evaluate, fBetaLowCut/MeV, fBetaEKinEndPoint/MeV, npar); // print info - G4cout << " ---> Initializing beta-decay energy spectrum (allowed shape) with"; + G4cout << " ---> Initializing beta-decay energy spectrum with"; G4cout << " end-point energy of " << fBetaEKinEndPoint / MeV << " MeV" << G4endl; }