From 791d1a6c22f6e5a2d3ad5ccd272b825b7a1aadd8 Mon Sep 17 00:00:00 2001 From: iarspider Date: Mon, 31 May 2021 08:52:28 +0200 Subject: [PATCH 1/2] Fix for Pythia8 >= 304 --- FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc b/FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc index e7e8acf1b53e0..19a653f8abfa2 100644 --- a/FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc +++ b/FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc @@ -40,6 +40,11 @@ #include "TFile.h" #include "TLorentzVector.h" +#if PYTHIA_VERSION_INTEGER < 8304 +typedef Pythia8::ParticleDataEntry* ParticleDataEntryPtr; +#else +typedef Pythia8::ParticleDataEntryPtr ParticleDataEntryPtr; +#endif // // class declaration // @@ -119,7 +124,7 @@ TestPythiaDecays::TestPythiaDecays(const edm::ParameterSet& iConfig) { std::cout << "ERROR: BAD PARTICLE, pythia is not aware of pid " << pid << std::endl; std::exit(1); } - Pythia8::ParticleDataEntry* pd = pdt.particleDataEntryPtr(pid); + ParticleDataEntryPtr pd = pdt.particleDataEntryPtr(pid); // mass histograms double m0 = pd->m0(); From f8ad4dcbf95fef4abe1a7c586fd8b942f239af43 Mon Sep 17 00:00:00 2001 From: iarspider Date: Mon, 31 May 2021 10:15:00 +0200 Subject: [PATCH 2/2] Remove trailing space --- FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc b/FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc index 19a653f8abfa2..c7520105ac323 100644 --- a/FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc +++ b/FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc @@ -44,7 +44,7 @@ typedef Pythia8::ParticleDataEntry* ParticleDataEntryPtr; #else typedef Pythia8::ParticleDataEntryPtr ParticleDataEntryPtr; -#endif +#endif // // class declaration //