Skip to content

feat: Update to PYTHIA v8.309 #64

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

Draft
matthewfeickert wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: Update to PYTHIA v8.309 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44ac546
Update to PYTHIA v8.309
matthewfeickert Jun 28, 2023
b019147
Add tests for root_path
matthewfeickert Jun 28, 2023
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
7 changes: 7 additions & 0 deletions .github/workflows/docker-centos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@ jobs:
scailfin/madgraph5-amc-nlo-centos:sha-${GITHUB_SHA::8}
"cp -r ${PWD}/tests .; cd tests; bash tests.sh"

- name: Test madevent has valid root_path
run: >-
docker run --rm
-v $PWD:$PWD
scailfin/madgraph5-amc-nlo-centos:sha-${GITHUB_SHA::8}
"cp -r ${PWD}/tests .; cd tests; mg5_aMC test_root_path.mg5; ./bhabha/bin/madevent launch -f"

- name: Check NLO process has dependencies
run: >-
docker run --rm
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/docker-debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@ jobs:
scailfin/madgraph5-amc-nlo:sha-${GITHUB_SHA::8}
"cp -r ${PWD}/tests .; cd tests; bash tests.sh"

- name: Test madevent has valid root_path
run: >-
docker run --rm
-v $PWD:$PWD
scailfin/madgraph5-amc-nlo:sha-${GITHUB_SHA::8}
"cp -r ${PWD}/tests .; cd tests; mg5_aMC test_root_path.mg5; ./bhabha/bin/madevent launch -f"

- name: Check NLO process has dependencies
run: >-
docker run --rm
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ image:
--build-arg HEPMC_VERSION=2.06.11 \
--build-arg FASTJET_VERSION=3.3.4 \
--build-arg LHAPDF_VERSION=6.5.3 \
--build-arg PYTHIA_VERSION=8306 \
--build-arg PYTHIA_VERSION=8309 \
--build-arg MG_VERSION=3.5.0 \
-t scailfin/madgraph5-amc-nlo:latest \
-t scailfin/madgraph5-amc-nlo:3.5.0 \
Expand All @@ -24,7 +24,7 @@ test:
--build-arg HEPMC_VERSION=2.06.11 \
--build-arg FASTJET_VERSION=3.3.4 \
--build-arg LHAPDF_VERSION=6.5.3 \
--build-arg PYTHIA_VERSION=8306 \
--build-arg PYTHIA_VERSION=8309 \
--build-arg MG_VERSION=3.5.0 \
-t scailfin/madgraph5-amc-nlo:debug-local

Expand All @@ -34,6 +34,6 @@ test-centos:
--build-arg HEPMC_VERSION=2.06.11 \
--build-arg FASTJET_VERSION=3.3.4 \
--build-arg LHAPDF_VERSION=6.5.3 \
--build-arg PYTHIA_VERSION=8306 \
--build-arg PYTHIA_VERSION=8309 \
--build-arg MG_VERSION=3.5.0 \
-t scailfin/madgraph5-amc-nlo-centos:debug-local
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The Docker image contains:
* [HepMC2](http://hepmc.web.cern.ch/hepmc/) `v2.06.11`
* [LHAPDF](https://lhapdf.hepforge.org/) `v6.5.3`
* [FastJet](http://fastjet.fr/) `v3.3.4`
* [PYTHIA](https://pythia.org/) `v8.306`
* [PYTHIA](https://pythia.org/) `v8.309`
* [BOOST](https://www.boost.org/doc/libs/1_76_0/more/getting_started/unix-variants.html) `v1.76.0`

Additionally contains MadGraph5 controlled dependencies for NLO processes:
Expand Down
2 changes: 1 addition & 1 deletion docker/centos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ RUN mkdir /code && \
rm -rf /code

# Install PYTHIA
ARG PYTHIA_VERSION=8306
ARG PYTHIA_VERSION=8309
# PYTHON_VERSION already exists in the base image
# CentOS 7 gcc v4.8.5 is old enough need to specify -std=c++11
RUN mkdir /code && \
Expand Down
2 changes: 1 addition & 1 deletion docker/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ RUN mkdir /code && \
rm -rf /code

# Install PYTHIA
ARG PYTHIA_VERSION=8306
ARG PYTHIA_VERSION=8309
# PYTHON_VERSION already exists in the base image
RUN mkdir /code && \
cd /code && \
Expand Down