Skip to content

Revert "Add patches to propagate lhe numbering through herwig" #8417

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
cmsbuild merged 1 commit into from
Mar 31, 2023
Merged

Revert "Add patches to propagate lhe numbering through herwig" #8417

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
199 changes: 0 additions & 199 deletions LHEEventNum.patch
View file
Open in desktop

This file was deleted.

181 changes: 0 additions & 181 deletions LHEEventNumFxFx.patch
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions LesHouchesFileReader.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--- ThePEG-2.2.2/LesHouches/LesHouchesFileReader.cc 2021-03-08 13:18:39.000000001 +0100
+++ LesHouchesFileReader_fix.cc 2021-03-08 13:18:30.000000001 +0100
@@ -546,6 +546,14 @@
*/
if(readingInitWeights_sc && !cfile.find("</weightgroup")) {
hs = cfile.getline();
+ //cout << "hs=" << hs << endl;
+ //cout << "weightinfo= " << weightinfo << endl;
+ //fix for potential new lines:
+ if(!cfile.find("<weight") and !cfile.find("</weightgroup")) {
+ weightinfo = weightinfo + hs;
+ //cout << "weightinfo fixed= " << weightinfo << endl;
+ continue;
+ }
istringstream isc(hs);
int ws = 0;
/* get the name that will be used to identify the scale
Loading