Skip to content
Snippets Groups Projects
Commit 7928499b authored by Pere Mato Vila's avatar Pere Mato Vila
Browse files

Fix for ROOT-7070 - ROOT does not compile with latest Pythia 8 version > 8.2

parent 2e618321
No related branches found
No related tags found
No related merge requests found
...@@ -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->statistics(); fPythia->stat();
} }
//___________________________________________________________________________ //___________________________________________________________________________
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment