From d3b5fff2d0adbfec421fc32fca201f737642b26a Mon Sep 17 00:00:00 2001 From: Oliver Kirsebom <oliskir@stkernfys.phys.au.dk> Date: Tue, 23 May 2017 10:16:52 +0200 Subject: [PATCH] improved compile script --- VeikonKone.dox | 6 +++--- allowed.mac | 4 ++-- compile.sh | 10 +++++++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/VeikonKone.dox b/VeikonKone.dox index 9feef7e..e494814 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/VeikonKone/include/ +INPUT = /home/oliskir/f20/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 @@ -2087,7 +2087,7 @@ HIDE_UNDOC_RELATIONS = YES # set to NO # The default value is: NO. -HAVE_DOT = YES +HAVE_DOT = NO # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed # to run in parallel. When set to 0 doxygen will base this on the number of @@ -2259,7 +2259,7 @@ INTERACTIVE_SVG = YES # found. If left blank, it is assumed the dot tool can be found in the path. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_PATH = /usr/bin +DOT_PATH = # The DOTFILE_DIRS tag can be used to specify one or more directories that # contain dot files that are included in the documentation (see the \dotfile diff --git a/allowed.mac b/allowed.mac index 237b8a3..1e225f5 100644 --- a/allowed.mac +++ b/allowed.mac @@ -19,13 +19,13 @@ # energy spectrum /VK/source/betaSpectrum true /VK/source/betaEndPoint 5.40 MeV -/VK/source/betaMinEnergy 0.00 MeV +/VK/source/betaMinEnergy 5.00 MeV /VK/source/betaMaxEnergy 5.40 MeV # output /VK/output/zeroSuppression true /VK/storeTrajectoryData false -/VK/output/openFile output/220517/allowed.root +/VK/output/openFile output/220517/allowed_cut.root # run simulation /run/beamOn 20000000 diff --git a/compile.sh b/compile.sh index 7b3184d..f8a0ae0 100755 --- a/compile.sh +++ b/compile.sh @@ -1,6 +1,14 @@ rm -f CMakeCache.txt rm -rf CMakeFiles -cmake -DCMAKE_BUILD_TYPE=DEBUG -DGeant4_DIR=/home/oliskir/src/geant-4.10/geant4.10.3-install/lib/Geant4-10.3.0 $pwd + +#@carbonoli +#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 + +#@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 + make -j4 -- GitLab