From ed8f2d3c71e7e97203a25fc738bf0a92e8298f31 Mon Sep 17 00:00:00 2001 From: Wesley Ketchum Date: Thu, 14 Sep 2023 14:17:30 -0500 Subject: [PATCH 1/3] updates to GENIE for reweight/updated container --- Dockerfile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a7c448..1849287 100644 --- a/Dockerfile +++ b/Dockerfile @@ -310,10 +310,8 @@ RUN mkdir src &&\ # deduces the version from the files in the .git directory if git is # not installed. ############################################################################### -LABEL genie.version=3.02.00 -ENV GENIE_VERSION=3_02_00 -#ENV GENIE_REWEIGHT_VERSION=1_02_00 - +LABEL genie.version=3.04.00 +ENV GENIE_VERSION=3_04_00 ENV GENIE=/usr/local/src/GENIE/Generator RUN mkdir -p ${GENIE} &&\ @@ -332,6 +330,17 @@ RUN mkdir -p ${GENIE} &&\ make -j$NPROC && \ make -j$NPROC install +#Unfortunately ... need to use the master branch of GENIE reweight... +ENV GENIE_REWEIGHT_VERSION=1_02_02 +ENV GENIE_REWEIGHT=/usr/local/src/GENIE/Reweight +RUN mkdir -p ${GENIE_REWEIGHT} &&\ + #${__wget} https://github.com/GENIE-MC/Reweight/archive/refs/tags/R-${GENIE_REWEIGHT_VERSION}.tar.gz |\ + ${__wget} https://github.com/GENIE-MC/Reweight/tarball/master |\ + ${__untar_to} ${GENIE_REWEIGHT} &&\ + cd ${GENIE_REWEIGHT} &&\ + make -j$NPROC && \ + make -j$NPROC install + ############################################################################### # Catch2 ############################################################################### From a8eda4bda08b1b502c9024f900fa9031a3b97ba3 Mon Sep 17 00:00:00 2001 From: Wesley Ketchum Date: Thu, 14 Sep 2023 14:23:48 -0500 Subject: [PATCH 2/3] missed a line on the merge conflict --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b388aa5..ba50983 100644 --- a/Dockerfile +++ b/Dockerfile @@ -332,7 +332,6 @@ LABEL genie.version=3.04.00 ENV GENIE_VERSION=3_04_00 #ENV GENIE_REWEIGHT_VERSION=1_02_00 ->>>>>>> e520b871a3abb14bc310accf3ef8fea9e05473ee ENV GENIE=/usr/local/src/GENIE/Generator RUN mkdir -p ${GENIE} &&\ From 274fbe1969aecdf65587aeac6760616a1f19faf7 Mon Sep 17 00:00:00 2001 From: Wesley Ketchum Date: Thu, 28 Sep 2023 15:23:17 +0200 Subject: [PATCH 3/3] updates for GENIE with pythia8 and reweight --- Dockerfile | 59 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba50983..b1e7010 100644 --- a/Dockerfile +++ b/Dockerfile @@ -131,6 +131,39 @@ RUN mkdir src && \ cd ../ && rm -rf src &&\ echo "${__prefix}/pythia6/" > /etc/ld.so.conf.d/pythia6.conf +############################################################################### +# LHAPDF +# +# Needed for GENIE +# +# - We disable the python subpackage because it is based on Python2 whose +# executable has been removed from Ubuntu 22.04. +############################################################################### +LABEL lhapdf.version="6.5.4" +RUN mkdir src &&\ + ${__wget} https://lhapdf.hepforge.org/downloads/?f=LHAPDF-6.5.4.tar.gz |\ + ${__untar} &&\ + cd src &&\ + ./configure --disable-python --prefix=${__prefix} &&\ + make -j$NPROC install &&\ + cd ../ &&\ + rm -rf src + +############################################################################### +# PYTHIA8 +############################################################################### +RUN install-ubuntu-packages \ + rsync + +LABEL pythia.version="8.310" +RUN mkdir src && \ + ${__wget} https://pythia.org/download/pythia83/pythia8310.tgz | ${__untar} &&\ + cd src &&\ + ./configure --with-lhapdf6 --prefix=${__prefix} &&\ + make -j$NPROC install &&\ + cd ../ &&\ + rm -rf src + ############################################################################### # CERN's ROOT # Needed for GENIE and serialization within the Framework @@ -198,6 +231,7 @@ RUN mkdir src &&\ -Dxrootd=OFF \ -Dgsl_shared=ON \ -Dmathmore=ON \ + -Dpythia8=ON \ -Dpythia6=ON \ -DPYTHIA6_LIBRARY=${__prefix}/pythia6/libPythia6.so \ -B build \ @@ -278,23 +312,6 @@ RUN mkdir src &&\ &&\ rm -rf src -############################################################################### -# LHAPDF -# -# Needed for GENIE -# -# - We disable the python subpackage because it is based on Python2 whose -# executable has been removed from Ubuntu 22.04. -############################################################################### -LABEL lhapdf.version="6.5.3" -RUN mkdir src &&\ - ${__wget} https://lhapdf.hepforge.org/downloads/?f=LHAPDF-6.5.3.tar.gz |\ - ${__untar} &&\ - cd src &&\ - ./configure --disable-python --prefix=${__prefix} &&\ - make -j$NPROC install &&\ - cd ../ &&\ - rm -rf src ############################################################################### # GENIE @@ -327,10 +344,8 @@ RUN install-ubuntu-packages \ liblog4cpp5-dev \ libtool - LABEL genie.version=3.04.00 ENV GENIE_VERSION=3_04_00 -#ENV GENIE_REWEIGHT_VERSION=1_02_00 ENV GENIE=/usr/local/src/GENIE/Generator @@ -343,15 +358,15 @@ RUN mkdir -p ${GENIE} &&\ --disable-lhapdf5 \ --enable-gfortran \ --with-gfortran-lib=/usr/x86_64-linux-gnu/ \ - --disable-pythia8 \ - --with-pythia6-lib=${__prefix}/pythia6 \ + --enable-pythia8 \ + --with-pythia8-lib=${__prefix}/lib \ --enable-test \ && \ make -j$NPROC && \ make -j$NPROC install #Unfortunately ... need to use the master branch of GENIE reweight... -ENV GENIE_REWEIGHT_VERSION=1_02_02 +#ENV GENIE_REWEIGHT_VERSION=1_02_02 ENV GENIE_REWEIGHT=/usr/local/src/GENIE/Reweight RUN mkdir -p ${GENIE_REWEIGHT} &&\ #${__wget} https://github.com/GENIE-MC/Reweight/archive/refs/tags/R-${GENIE_REWEIGHT_VERSION}.tar.gz |\