From ec434a55f168481859b7a7ec12fb0ff70b9db84b Mon Sep 17 00:00:00 2001 From: Fons Rademakers <Fons.Rademakers@cern.ch> Date: Tue, 11 Feb 2014 10:45:02 +0100 Subject: [PATCH] Add initialization for beams with different energies, and some information methods. By Thomas Ruf. --- montecarlo/pythia8/inc/TPythia8.h | 6 ++++ montecarlo/pythia8/src/TPythia8.cxx | 43 +++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/montecarlo/pythia8/inc/TPythia8.h b/montecarlo/pythia8/inc/TPythia8.h index 0f70c2788df..c686cf8fbd3 100644 --- a/montecarlo/pythia8/inc/TPythia8.h +++ b/montecarlo/pythia8/inc/TPythia8.h @@ -97,6 +97,12 @@ public: void ReadString(const char* string) const; void ReadConfigFile(const char* string) const; Bool_t Initialize(Int_t idAin, Int_t idBin, Double_t ecms); + Bool_t Initialize(Int_t idAin, Int_t idBin, Double_t eAin, Double_t eBin); + void ListAll() const; + void ListChanged() const; + void Plist(Int_t id) const; + void PlistAll() const; + void PlistChanged() const; void PrintStatistics() const; void EventListing() const; Int_t GetN() const; diff --git a/montecarlo/pythia8/src/TPythia8.cxx b/montecarlo/pythia8/src/TPythia8.cxx index 8b9767381fd..94f4a27a461 100644 --- a/montecarlo/pythia8/src/TPythia8.cxx +++ b/montecarlo/pythia8/src/TPythia8.cxx @@ -142,6 +142,14 @@ Bool_t TPythia8::Initialize(Int_t idAin, Int_t idBin, Double_t ecms) return fPythia->init(idAin, idBin, ecms); } +//___________________________________________________________________________ +Bool_t TPythia8::Initialize(Int_t idAin, Int_t idBin, Double_t eAin, Double_t eBin) +{ + // Initialization + AddParticlesToPdgDataBase(); + return fPythia->init(idAin, idBin, eAin, eBin); +} + //___________________________________________________________________________ void TPythia8::GenerateEvent() { @@ -267,6 +275,41 @@ void TPythia8::ReadConfigFile(const char* string) const fPythia->readFile(string); } +//___________________________________________________________________________ +void TPythia8::ListAll() const +{ + // Event listing + fPythia->settings.listAll(); +} + +//___________________________________________________________________________ +void TPythia8::ListChanged() const +{ + // Event listing + fPythia->settings.listChanged(); +} + +//___________________________________________________________________________ +void TPythia8::Plist(Int_t id) const +{ + // Event listing + fPythia->particleData.list(id); +} + +//___________________________________________________________________________ +void TPythia8::PlistAll() const +{ + // Event listing + fPythia->particleData.listAll(); +} + +//___________________________________________________________________________ +void TPythia8::PlistChanged() const +{ + // Event listing + fPythia->particleData.listChanged(); +} + //___________________________________________________________________________ void TPythia8::PrintStatistics() const { -- GitLab