From f5e0b8da944b42932241846eaa5227cfee837c5d Mon Sep 17 00:00:00 2001
From: Oliver Kirsebom <oliver.kirsebom@gmail.com>
Date: Sat, 3 Aug 2019 08:59:46 -0300
Subject: [PATCH] updated macros
---
VeikonKone.dox | 2 +-
mac/forbidden.mac | 13 +++++++++++++
mac/forbidden_dag_final-1.mac | 3 +++
mac/forbidden_dag_final-2.mac | 3 +++
mac/forbidden_dag_final-3.mac | 3 +++
mac/forbidden_dag_final-4.mac | 3 +++
mac/forbidden_dag_final-5.mac | 10 +++++-----
mac/forbidden_dag_final-6.mac | 10 +++++-----
src/VKPrimaryGeneratorAction.cpp | 2 +-
9 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/VeikonKone.dox b/VeikonKone.dox
index 6af4a56..8070a26 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 87f9d91..b22d456 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 ed93b2b..50d5992 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 a91a71c..94b9320 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 b6758ca..ea80f9d 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 00d2c60..314b575 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 7a41e3a..ef2ed03 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 b81add2..f2b7d80 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 5f7870e..e9e0320 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;
}
--
GitLab