Skip to content

Commit

Permalink
feat: Update to mg5_aMC v3.5.1 (#74)
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewfeickert authored Aug 25, 2023
1 parent 73c8357 commit ba3efc6
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-centos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -31,15 +31,15 @@ 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

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:
Expand All @@ -63,15 +63,15 @@ 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.

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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit ba3efc6

Please sign in to comment.