Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VeikonKone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AUSA
Oliskir
VeikonKone
Commits
62366fc3
Commit
62366fc3
authored
7 years ago
by
Oliver Kirsebom
Browse files
Options
Downloads
Patches
Plain Diff
progress gets correctly printed
parent
d3b5fff2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
VeikonKone.dox
+3
-3
3 additions, 3 deletions
VeikonKone.dox
allowed.mac
+4
-2
4 additions, 2 deletions
allowed.mac
analysis/plot/CreateHisto.C
+2
-1
2 additions, 1 deletion
analysis/plot/CreateHisto.C
compile.sh
+2
-2
2 additions, 2 deletions
compile.sh
src/VKEventAction.cpp
+2
-0
2 additions, 0 deletions
src/VKEventAction.cpp
with
13 additions
and
8 deletions
VeikonKone.dox
+
3
−
3
View file @
62366fc3
...
...
@@ -753,7 +753,7 @@ WARN_LOGFILE =
# spaces.
# Note: If this tag is empty the current directory is searched.
INPUT = /home/oliskir/f20/VeikonKone/include/
INPUT = /home/oliskir/
Desktop/
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 =
NO
HAVE_DOT =
YES
# 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 =
DOT_PATH =
/usr/bin
# 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
...
...
This diff is collapsed.
Click to expand it.
allowed.mac
+
4
−
2
View file @
62366fc3
...
...
@@ -25,7 +25,9 @@
# output
/VK/output/zeroSuppression true
/VK/storeTrajectoryData false
/VK/output/openFile output/220517/allowed_cut.root
# run simulation
/run/beamOn 20000000
/VK/output/openFile output/test1.root
/run/beamOn 1000
/VK/output/openFile output/test2.root
/run/beamOn 1000
This diff is collapsed.
Click to expand it.
analysis/plot/CreateHisto.C
+
2
−
1
View file @
62366fc3
...
...
@@ -20,6 +20,7 @@ void CreateHisto(double hours = 168, int binWidth = 100, double ROImin = 5600, d
const
int
bins
=
(
emax
-
emin
)
/
binWidth
;
vector
<
string
>
fname
=
{
"backgr"
,
"allowed"
,
"forbidden"
,
"pileup"
,
"summing"
};
vector
<
string
>
hname
=
{
"backgr"
,
"allowed"
,
"forbidden"
,
"pileup"
,
"summing"
};
vector
<
double
>
sf
;
vector
<
TH1F
*>
hist
,
histVeto
;
...
...
@@ -30,7 +31,7 @@ void CreateHisto(double hours = 168, int binWidth = 100, double ROImin = 5600, d
for
(
auto
&
fn
:
fname
)
{
// output histogram names
TString
hn
=
fn
;
TString
hn
=
hname
[
i
]
;
TString
hnV
=
hn
+
"Veto"
;
if
(
fn
==
"backgr"
)
{
...
...
This diff is collapsed.
Click to expand it.
compile.sh
+
2
−
2
View file @
62366fc3
...
...
@@ -2,13 +2,13 @@ rm -f CMakeCache.txt
rm
-rf
CMakeFiles
#@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
#@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
#
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
This diff is collapsed.
Click to expand it.
src/VKEventAction.cpp
+
2
−
0
View file @
62366fc3
...
...
@@ -262,6 +262,8 @@ void VKEventAction::PrintProgress()
// current event no.
double
evt
=
G4RunManager
::
GetRunManager
()
->
GetCurrentEvent
()
->
GetEventID
();
if
(
evt
==
0
)
fEvtPct
=
0
;
G4int
evtPct
=
(
evt
+
0.5
)
/
evtMax
*
100
;
if
(
evtPct
>
fEvtPct
&&
evt
>
0
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment