From ba3efc64530e192765abd07cd4988f22b075b496 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Thu, 24 Aug 2023 20:03:17 -0500 Subject: [PATCH] feat: Update to mg5_aMC v3.5.1 (#74) * Update to MadGraph5_aMC-NLO v3.5.1 - c.f. https://launchpad.net/mg5amcnlo/3.0/3.5.x/+download/MG5_aMC_v3.5.1.tar.gz --- .github/workflows/docker-centos.yml | 2 +- .github/workflows/docker-debian.yml | 2 +- Makefile | 8 ++++---- README.md | 12 ++++++------ docker/centos/Dockerfile | 2 +- docker/debian/Dockerfile | 2 +- test_runner.sh | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker-centos.yml b/.github/workflows/docker-centos.yml index b0666ca..f68cefe 100644 --- a/.github/workflows/docker-centos.yml +++ b/.github/workflows/docker-centos.yml @@ -30,7 +30,7 @@ jobs: run: | DOCKER_IMAGE=scailfin/madgraph5-amc-nlo-centos VERSION=latest - MADGRAPH_VERSION=mg5_amc3.5.0 + MADGRAPH_VERSION=mg5_amc3.5.1 REPO_NAME=${{github.repository}} REPO_NAME_LOWERCASE="${REPO_NAME,,}" if [[ $GITHUB_REF == refs/tags/* ]]; then diff --git a/.github/workflows/docker-debian.yml b/.github/workflows/docker-debian.yml index 672af32..77d198e 100644 --- a/.github/workflows/docker-debian.yml +++ b/.github/workflows/docker-debian.yml @@ -30,7 +30,7 @@ jobs: run: | DOCKER_IMAGE=scailfin/madgraph5-amc-nlo VERSION=latest - MADGRAPH_VERSION=mg5_amc3.5.0 + MADGRAPH_VERSION=mg5_amc3.5.1 REPO_NAME=${{github.repository}} REPO_NAME_LOWERCASE="${REPO_NAME,,}" if [[ $GITHUB_REF == refs/tags/* ]]; then diff --git a/Makefile b/Makefile index ca45da6..1993708 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ image: --build-arg FASTJET_VERSION=3.3.4 \ --build-arg LHAPDF_VERSION=6.5.3 \ --build-arg PYTHIA_VERSION=8306 \ - --build-arg MG_VERSION=3.5.0 \ + --build-arg MG_VERSION=3.5.1 \ -t scailfin/madgraph5-amc-nlo:latest \ - -t scailfin/madgraph5-amc-nlo:3.5.0 \ + -t scailfin/madgraph5-amc-nlo:3.5.1 \ --compress test: @@ -25,7 +25,7 @@ test: --build-arg FASTJET_VERSION=3.3.4 \ --build-arg LHAPDF_VERSION=6.5.3 \ --build-arg PYTHIA_VERSION=8306 \ - --build-arg MG_VERSION=3.5.0 \ + --build-arg MG_VERSION=3.5.1 \ -t scailfin/madgraph5-amc-nlo:debug-local test-centos: @@ -35,5 +35,5 @@ test-centos: --build-arg FASTJET_VERSION=3.3.4 \ --build-arg LHAPDF_VERSION=6.5.3 \ --build-arg PYTHIA_VERSION=8306 \ - --build-arg MG_VERSION=3.5.0 \ + --build-arg MG_VERSION=3.5.1 \ -t scailfin/madgraph5-amc-nlo-centos:debug-local diff --git a/README.md b/README.md index 0a348a6..0c530cf 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Docker image for Python 3 compliant [MadGraph5_aMC@NLO](https://launchpad.net/mg The Docker image contains: -* [MadGraph5_aMC@NLO](https://launchpad.net/mg5amcnlo) `v3.5.0` +* [MadGraph5_aMC@NLO](https://launchpad.net/mg5amcnlo) `v3.5.1` * Python 3.10 (3.9 CentOS) * [HepMC2](http://hepmc.web.cern.ch/hepmc/) `v2.06.11` * [LHAPDF](https://lhapdf.hepforge.org/) `v6.5.3` @@ -31,7 +31,7 @@ Additionally contains MadGraph5 controlled dependencies for NLO processes: - Use `docker pull` to pull down the image corresponding to the tag. For example: ``` -docker pull scailfin/madgraph5-amc-nlo:mg5_amc3.5.0 +docker pull scailfin/madgraph5-amc-nlo:mg5_amc3.5.1 ``` ## Use @@ -39,7 +39,7 @@ docker pull scailfin/madgraph5-amc-nlo:mg5_amc3.5.0 MadGraph5_aMC@NLO is in `PATH` when the container starts ``` -docker run --rm scailfin/madgraph5-amc-nlo:mg5_amc3.5.0 "mg5_aMC --help" +docker run --rm scailfin/madgraph5-amc-nlo:mg5_amc3.5.1 "mg5_aMC --help" Usage: mg5_aMC [options] [FILE] Options: @@ -63,7 +63,7 @@ so you should be able to make any directory inside the container a working direc If you run the image as an interactive container with your local path bind mounted to the working directory ```shell -docker run --rm -ti -v $PWD:$PWD -w $PWD scailfin/madgraph5-amc-nlo:mg5_amc3.5.0 +docker run --rm -ti -v $PWD:$PWD -w $PWD scailfin/madgraph5-amc-nlo:mg5_amc3.5.1 ``` output from your work in that directory in the interactive session will be preserved when the container exists. @@ -71,7 +71,7 @@ output from your work in that directory in the interactive session will be prese The container can be used a runtime application by passing in a MadGraph program as a `.mg5` file to the `mg5_aMC` CLI API ```shell -docker run --rm -v $PWD:$PWD -w $PWD scailfin/madgraph5-amc-nlo:mg5_amc3.5.0 "mg5_aMC file-name.mg5" +docker run --rm -v $PWD:$PWD -w $PWD scailfin/madgraph5-amc-nlo:mg5_amc3.5.1 "mg5_aMC file-name.mg5" ``` For further examples see the tests. @@ -81,7 +81,7 @@ For further examples see the tests. As an example test you can run the [top mass scan example](https://answers.launchpad.net/mg5amcnlo/+faq/2186) in the `tests` directory inside the Docker container by running the following from the top level directory of this repository ```shell -docker run --rm -v $PWD:$PWD scailfin/madgraph5-amc-nlo:mg5_amc3.5.0 "cd ${PWD}/tests; bash tests.sh" +docker run --rm -v $PWD:$PWD scailfin/madgraph5-amc-nlo:mg5_amc3.5.1 "cd ${PWD}/tests; bash tests.sh" ``` or run the test runner diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile index 29a2bf9..541fc17 100644 --- a/docker/centos/Dockerfile +++ b/docker/centos/Dockerfile @@ -135,7 +135,7 @@ RUN mkdir -p /code && \ rm -rf /code # Install MadGraph5_aMC@NLO for Python 3 and PYTHIA 8 interface -ARG MG_VERSION=3.5.0 +ARG MG_VERSION=3.5.1 # Versions viewable on Illinois mirror # http://madgraph.physics.illinois.edu/Downloads/MG5aMC_PY8_interface/ ARG MG5aMC_PY8_INTERFACE_VERSION=1.3 diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile index faf09f9..2a29db2 100644 --- a/docker/debian/Dockerfile +++ b/docker/debian/Dockerfile @@ -125,7 +125,7 @@ RUN mkdir /code && \ rm -rf /code # Install MadGraph5_aMC@NLO for Python 3 and PYTHIA 8 interface -ARG MG_VERSION=3.5.0 +ARG MG_VERSION=3.5.1 # Versions viewable on Illinois mirror # http://madgraph.physics.illinois.edu/Downloads/MG5aMC_PY8_interface/ ARG MG5aMC_PY8_INTERFACE_VERSION=1.3 diff --git a/test_runner.sh b/test_runner.sh index 0896c47..cf16b83 100644 --- a/test_runner.sh +++ b/test_runner.sh @@ -4,7 +4,7 @@ set -e set -u set -o pipefail -test_image="scailfin/madgraph5-amc-nlo:mg5_amc3.5.0" +test_image="scailfin/madgraph5-amc-nlo:mg5_amc3.5.1" docker pull "${test_image}" docker run \