Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
atlas
athena
Merge requests
!59118
Assume Pythia83 for the master
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Assume Pythia83 for the master
averbyts/athena:drop_old_pythia82
into
master
Overview
11
Commits
1
Pipelines
1
Changes
5
All threads resolved!
Show all comments
Merged
Andrii Verbytskyi
requested to merge
averbyts/athena:drop_old_pythia82
into
master
2 years ago
Overview
11
Commits
1
Pipelines
1
Changes
5
All threads resolved!
Show all comments
Expand
Assume Pythia83 for the master
Tag
@ewelina
@akraszna
@jchapman
@cgutscho
Edited
2 years ago
by
Andrii Verbytskyi
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
c7713fb0
1 commit,
2 years ago
5 files
+
1
−
57
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
Search (e.g. *.vue) (Ctrl+P)
Generators/Pythia8_i/Pythia8_i/Pythia8_i.h
+
1
−
7
Options
@@ -15,13 +15,7 @@
//#include "Pythia8/../Pythia8Plugins/HepMC2.h"
#ifdef HEPMC3
#ifdef PYTHIA_VERSION_INTEGER
#if PYTHIA_VERSION_INTEGER > 8299
#include
"Pythia8Plugins/HepMC3.h"
#else
#include
"Pythia8ToHepMC3.h"
#endif
#endif
#include
"Pythia8Plugins/HepMC3.h"
namespace
HepMC
{
typedef
HepMC3
::
Pythia8ToHepMC3
Pythia8ToHepMC
;
}
Loading