Commit e6631909 authored by Andre Sailer's avatar Andre Sailer
Browse files

[SPI-1881]: LCG_100_ATLAS_1: port forward evtGen 1.7.0 patch

parent e3e4e59b
Pipeline #2565559 passed with stage
in 45 seconds
......@@ -128,3 +128,30 @@
inline EvtVector4R& EvtVector4R::operator+=(const EvtVector4R& v2){
--- src/EvtGenExternal/EvtPythiaEngine.cpp.orig 2017-12-13 16:02:55.000000000 +0100
+++ src/EvtGenExternal/EvtPythiaEngine.cpp 2021-04-22 14:57:51.574914300 +0200
@@ -35,6 +35,12 @@
#include <iostream>
#include <sstream>
+#if PYTHIA_VERSION_INTEGER < 8304
+typedef Pythia8::ParticleDataEntry* ParticleDataEntryPtr;
+#else
+typedef Pythia8::ParticleDataEntryPtr ParticleDataEntryPtr;
+#endif
+
using std::endl;
EvtPythiaEngine::EvtPythiaEngine(std::string xmlDir, bool convertPhysCodes,
@@ -442,9 +448,9 @@
double mmax = EvtPDL::getMaxMass(particleId);
// Particle data pointers
- Pythia8::ParticleDataEntry * entry_generic =
+ ParticleDataEntryPtr entry_generic =
_genericPartData.particleDataEntryPtr(PDGCode);
- Pythia8::ParticleDataEntry * entry_alias =
+ ParticleDataEntryPtr entry_alias =
_aliasPartData.particleDataEntryPtr(PDGCode);
if (entry_generic != 0) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment