forked from cms-sw/cmsdist
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathevtgen-2.0.0.patch
39 lines (32 loc) · 1.3 KB
/
evtgen-2.0.0.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
--- a/src/EvtGenExternal/EvtPythiaEngine.cpp.orig 2020-04-24 18:27:48.000000000 +0200
+++ b/src/EvtGenExternal/EvtPythiaEngine.cpp 2021-04-14 09:17:55.660743600 +0200
@@ -36,7 +36,13 @@
#include <cmath>
#include <iostream>
-#include <sstream>
+#include <sstream>
+
+#if PYTHIA_VERSION_INTEGER < 8304
+typedef Pythia8::ParticleDataEntry* ParticleDataEntryPtr;
+#else
+typedef Pythia8::ParticleDataEntryPtr ParticleDataEntryPtr;
+#endif
using std::endl;
@@ -430,9 +436,9 @@
// or assignment will give it a different memory address and it will no longer refer to
// the original particleData information from the generator pointer.
- Pythia8::ParticleDataEntry* entry_generic =
+ ParticleDataEntryPtr entry_generic =
_genericPythiaGen->particleData.particleDataEntryPtr( PDGCode );
- Pythia8::ParticleDataEntry* entry_alias =
+ ParticleDataEntryPtr entry_alias =
_aliasPythiaGen->particleData.particleDataEntryPtr( PDGCode );
// Check that the PDG code is not zero/null and exclude other
--- a/EvtGenBase/EvtMatrix.hh.orig 2021-04-13 23:20:29.588804900 +0200
+++ b/EvtGenBase/EvtMatrix.hh 2021-04-13 23:20:36.663547400 +0200
@@ -23,6 +23,7 @@
#include <sstream>
#include <vector>
+#include <cmath>
template <class T>
class EvtMatrix {