-
Notifications
You must be signed in to change notification settings - Fork 215
Upgrade EvtGen to v03.00.00 #10580
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.
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
+71
−7
Merged
Upgrade EvtGen to v03.00.00 #10580
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
fe13f1d
update spec file for EvtGen v3
ae4090f
patch for pythia8 with the EvtGenv3
d845961
bump evtgen to 3.0.0; disable sherpa mpi
8089a4f
add back mpi to sherpa
a8b3ab8
move to git
b341739
move to git
81cf1d3
Change patch level from p1 to p2 in evtgen.spec
smuzaffar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| +++ a/R03-00-00/src/EvtGenExternal/EvtSherpaPhotons.cpp.orig 2026-05-22 11:42:50.932434652 -0500 | ||
| +++ b/R03-00-00/src/EvtGenExternal/EvtSherpaPhotons.cpp 2026-05-22 11:42:23.583029106 -0500 | ||
| @@ -40,6 +40,7 @@ | ||
| #include <cstring> | ||
| #include <iostream> | ||
| #include <vector> | ||
| +#include <mutex> | ||
|
|
||
| using std::endl; | ||
|
|
||
| +++ a/R03-00-00/EvtGenExternal/EvtSherpaPhotons.hh.orig 2026-05-22 11:42:50.932434652 -0500 | ||
| +++ b/R03-00-00/EvtGenExternal/EvtSherpaPhotons.hh 2026-05-22 11:42:23.583029106 -0500 | ||
| @@ -32,6 +32,7 @@ | ||
| #include "SHERPA/Main/Sherpa.H" | ||
|
|
||
| #include <string> | ||
| +#include <mutex> | ||
|
|
||
| class EvtParticle; | ||
| class EvtAbsExternalGen; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| --- a/include/Pythia8Plugins/EvtGen.h.orig 2026-01-20 15:52:30.000000000 -0600 | ||
| +++ b/include/Pythia8Plugins/EvtGen.h 2026-05-18 14:10:47.647205823 -0500 | ||
| @@ -36,9 +36,15 @@ | ||
| // Return a random number. | ||
| double random() {if (rndmPtr) return rndmPtr->flat(); else return -1.0;} | ||
|
|
||
| + void setSeed(unsigned long int seed) override {lastSeedVal = seed;} | ||
| + unsigned long int lastSeed() const override {return lastSeedVal;} | ||
| + | ||
| // The random number pointer. | ||
| Rndm *rndmPtr; | ||
|
|
||
| +private: | ||
| + unsigned long int lastSeedVal{0}; | ||
| + | ||
| }; | ||
|
|
||
| //========================================================================== | ||
| @@ -434,12 +440,11 @@ | ||
|
|
||
| // Loop over the EvtGen entries. | ||
| if (!pythiaPtr) return; | ||
| - EvtDecayTable *egTable = EvtDecayTable::getInstance(); | ||
| - if (!egTable) return; | ||
| + EvtDecayTable &egTable = EvtDecayTable::getInstance(); | ||
| for (int iEntry = 0; iEntry < (int)EvtPDL::entries(); ++iEntry) { | ||
| EvtId egId = EvtPDL::getEntry(iEntry); | ||
| int pyId = EvtPDL::getStdHep(egId); | ||
| - if (egTable->getNModes(egId) == 0) continue; | ||
| + if (egTable.getNModes(egId) == 0) continue; | ||
| if (excIds.find(pyId) != excIds.end()) continue; | ||
|
|
||
| // Stop Pythia from decaying the particle and include in decay set. | ||
| @@ -462,7 +467,7 @@ | ||
| if (!final) continue; | ||
|
|
||
| // Get the signal and background decay modes. | ||
| - vector<EvtParticleDecayList> egList = egTable->getDecayTable(); | ||
| + vector<EvtParticleDecayList> egList = egTable.getDecayTable(); | ||
| int sigIdx = egId.getAlias(); | ||
| int bkgIdx = EvtPDL::evtIdFromStdHep(pyId).getAlias(); | ||
| if (sigIdx > (int)egList.size() || bkgIdx > (int)egList.size()) continue; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.