Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
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
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
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
68c04e80
Commit
68c04e80
authored
5 years ago
by
Axel Naumann
Browse files
Options
Downloads
Patches
Plain Diff
[pythia8] Allow hiding of banner (ROOT-10230).
parent
183fc338
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
montecarlo/pythia8/inc/TPythia8.h
+2
-2
2 additions, 2 deletions
montecarlo/pythia8/inc/TPythia8.h
montecarlo/pythia8/src/TPythia8.cxx
+5
-4
5 additions, 4 deletions
montecarlo/pythia8/src/TPythia8.cxx
with
7 additions
and
6 deletions
montecarlo/pythia8/inc/TPythia8.h
+
2
−
2
View file @
68c04e80
...
@@ -82,8 +82,8 @@ protected:
...
@@ -82,8 +82,8 @@ protected:
Pythia8
::
Pythia
*
fPythia
;
//! The pythia8 instance
Pythia8
::
Pythia
*
fPythia
;
//! The pythia8 instance
Int_t
fNumberOfParticles
;
//! Number of particles
Int_t
fNumberOfParticles
;
//! Number of particles
public:
public:
TPythia8
();
TPythia8
(
bool
printBanner
=
true
);
TPythia8
(
const
char
*
xmlDir
);
TPythia8
(
const
char
*
xmlDir
,
bool
printBanner
=
true
);
virtual
~
TPythia8
();
virtual
~
TPythia8
();
static
TPythia8
*
Instance
();
static
TPythia8
*
Instance
();
Pythia8
::
Pythia
*
Pythia8
()
{
return
fPythia
;}
Pythia8
::
Pythia
*
Pythia8
()
{
return
fPythia
;}
...
...
This diff is collapsed.
Click to expand it.
montecarlo/pythia8/src/TPythia8.cxx
+
5
−
4
View file @
68c04e80
...
@@ -88,7 +88,7 @@ TPythia8* TPythia8::fgInstance = 0;
...
@@ -88,7 +88,7 @@ TPythia8* TPythia8::fgInstance = 0;
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// Constructor
/// Constructor
TPythia8
::
TPythia8
()
:
TPythia8
::
TPythia8
(
bool
printBanner
/*= true*/
)
:
TGenerator
(
"TPythia8"
,
"TPythia8"
),
TGenerator
(
"TPythia8"
,
"TPythia8"
),
fPythia
(
0
),
fPythia
(
0
),
fNumberOfParticles
(
0
)
fNumberOfParticles
(
0
)
...
@@ -99,13 +99,14 @@ TPythia8::TPythia8():
...
@@ -99,13 +99,14 @@ TPythia8::TPythia8():
delete
fParticles
;
// was allocated as TObjArray in TGenerator
delete
fParticles
;
// was allocated as TObjArray in TGenerator
fParticles
=
new
TClonesArray
(
"TParticle"
,
50
);
fParticles
=
new
TClonesArray
(
"TParticle"
,
50
);
fPythia
=
new
Pythia8
::
Pythia
();
// If only we could skip stating the default of the first parameter...:
fPythia
=
new
Pythia8
::
Pythia
(
"../share/Pythia8/xmldoc"
,
printBanner
);
}
}
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// Constructor with an xmlDir (eg "../xmldoc"
/// Constructor with an xmlDir (eg "../xmldoc"
TPythia8
::
TPythia8
(
const
char
*
xmlDir
)
:
TPythia8
::
TPythia8
(
const
char
*
xmlDir
,
bool
printBanner
/*= true*/
)
:
TGenerator
(
"TPythia8"
,
"TPythia8"
),
TGenerator
(
"TPythia8"
,
"TPythia8"
),
fPythia
(
0
),
fPythia
(
0
),
fNumberOfParticles
(
0
)
fNumberOfParticles
(
0
)
...
@@ -116,7 +117,7 @@ TPythia8::TPythia8(const char *xmlDir):
...
@@ -116,7 +117,7 @@ TPythia8::TPythia8(const char *xmlDir):
delete
fParticles
;
// was allocated as TObjArray in TGenerator
delete
fParticles
;
// was allocated as TObjArray in TGenerator
fParticles
=
new
TClonesArray
(
"TParticle"
,
50
);
fParticles
=
new
TClonesArray
(
"TParticle"
,
50
);
fPythia
=
new
Pythia8
::
Pythia
(
xmlDir
);
fPythia
=
new
Pythia8
::
Pythia
(
xmlDir
,
printBanner
);
}
}
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
...
...
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