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
7928499b
Commit
7928499b
authored
10 years ago
by
Pere Mato Vila
Browse files
Options
Downloads
Patches
Plain Diff
Fix for ROOT-7070 - ROOT does not compile with latest Pythia 8 version > 8.2
parent
2e618321
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
montecarlo/pythia8/src/TPythia8.cxx
+23
-3
23 additions, 3 deletions
montecarlo/pythia8/src/TPythia8.cxx
with
23 additions
and
3 deletions
montecarlo/pythia8/src/TPythia8.cxx
+
23
−
3
View file @
7928499b
...
@@ -139,7 +139,16 @@ Bool_t TPythia8::Initialize(Int_t idAin, Int_t idBin, Double_t ecms)
...
@@ -139,7 +139,16 @@ Bool_t TPythia8::Initialize(Int_t idAin, Int_t idBin, Double_t ecms)
{
{
// Initialization
// Initialization
AddParticlesToPdgDataBase
();
AddParticlesToPdgDataBase
();
return
fPythia
->
init
(
idAin
,
idBin
,
ecms
);
// Set arguments in Settings database.
fPythia
->
settings
.
mode
(
"Beams:idA"
,
idAin
);
fPythia
->
settings
.
mode
(
"Beams:idB"
,
idBin
);
fPythia
->
settings
.
mode
(
"Beams:frameType"
,
1
);
fPythia
->
settings
.
parm
(
"Beams:eCM"
,
ecms
);
return
fPythia
->
init
();
//return fPythia->init(idAin, idBin, ecms);
}
}
//___________________________________________________________________________
//___________________________________________________________________________
...
@@ -147,7 +156,18 @@ Bool_t TPythia8::Initialize(Int_t idAin, Int_t idBin, Double_t eAin, Double_t eB
...
@@ -147,7 +156,18 @@ Bool_t TPythia8::Initialize(Int_t idAin, Int_t idBin, Double_t eAin, Double_t eB
{
{
// Initialization
// Initialization
AddParticlesToPdgDataBase
();
AddParticlesToPdgDataBase
();
return
fPythia
->
init
(
idAin
,
idBin
,
eAin
,
eBin
);
// Set arguments in Settings database.
fPythia
->
settings
.
mode
(
"Beams:idA"
,
idAin
);
fPythia
->
settings
.
mode
(
"Beams:idB"
,
idBin
);
fPythia
->
settings
.
mode
(
"Beams:frameType"
,
2
);
fPythia
->
settings
.
parm
(
"Beams:eA"
,
eAin
);
fPythia
->
settings
.
parm
(
"Beams:eB"
,
eBin
);
// Send on to common initialization.
return
fPythia
->
init
();
//return fPythia->init(idAin, idBin, eAin, eBin);
}
}
//___________________________________________________________________________
//___________________________________________________________________________
...
@@ -314,7 +334,7 @@ void TPythia8::PlistChanged() const
...
@@ -314,7 +334,7 @@ void TPythia8::PlistChanged() const
void
TPythia8
::
PrintStatistics
()
const
void
TPythia8
::
PrintStatistics
()
const
{
{
// Print end of run statistics
// Print end of run statistics
fPythia
->
stat
istics
();
fPythia
->
stat
();
}
}
//___________________________________________________________________________
//___________________________________________________________________________
...
...
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