Skip to content

[Herwig7] Patch FXFX.h to match thepeg/LesHouches.h #7261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smuzaffar merged 1 commit into from
Sep 1, 2021
Merged

[Herwig7] Patch FXFX.h to match thepeg/LesHouches.h #7261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions herwig7-fxfx-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/MatrixElement/FxFx/FxFx.h b/MatrixElement/FxFx/FxFx.h
index a2133bb..23eba40 100644
--- a/MatrixElement/FxFx/FxFx.h
+++ b/MatrixElement/FxFx/FxFx.h
@@ -161,7 +161,7 @@ public:
ISTUP.resize(NUP);
MOTHUP.resize(NUP);
ICOLUP.resize(NUP);
- PUP.resize(NUP, std::vector<double>(5));
+ PUP.resize(NUP);
VTIMUP.resize(NUP);
SPINUP.resize(NUP);
}
@@ -231,7 +231,7 @@ public:
* Lab frame momentum (Px, Py, Pz, E and M in GeV) for the particle
* entries in this event.
*/
- vector< vector<double> > PUP;
+ vector< array<double,5> > PUP;

/**
* Invariant lifetime (c*tau, distance from production to decay im
diff --git a/MatrixElement/FxFx/FxFxReader.cc b/MatrixElement/FxFx/FxFxReader.cc
index 3dafe2c..d2340cd 100644
--- a/MatrixElement/FxFx/FxFxReader.cc
+++ b/MatrixElement/FxFx/FxFxReader.cc
@@ -1219,7 +1219,7 @@ bool FxFxReader::uncacheEvent() {
pos = mread(pos, hepeup.MOTHUP[0], hepeup.NUP);
hepeup.ICOLUP.resize(hepeup.NUP);
pos = mread(pos, hepeup.ICOLUP[0], hepeup.NUP);
- hepeup.PUP.resize(hepeup.NUP, vector<double>(5));
+ hepeup.PUP.resize(hepeup.NUP);
for ( int i = 0; i < hepeup.NUP; ++i )
pos = mread(pos, hepeup.PUP[i][0], 5);
hepeup.VTIMUP.resize(hepeup.NUP);
2 changes: 2 additions & 0 deletions herwig7.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ Requires: openloops
%endif
BuildRequires: autotools
Patch0: herwig_Matchbox_mg_py3
Patch1: herwig7-fxfx-fix

%prep
%setup -q -n Herwig-%{realversion}
%patch0 -p1
%patch1 -p1

# Regenerate build scripts
autoreconf -fiv
Expand Down