Skip to content
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

GENIE updates, including GENIE Reweight #79

Closed
wants to merge 6 commits into from
Closed

GENIE updates, including GENIE Reweight #79

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed8f2d3
updates to GENIE for reweight/updated container
wesketchum Sep 14, 2023
340a75e
Merge branch 'main' of https://github.com/LDMX-Software/docker
wesketchum Sep 14, 2023
a8eda4b
missed a line on the merge conflict
wesketchum Sep 14, 2023
274fbe1
updates for GENIE with pythia8 and reweight
wesketchum Sep 28, 2023
fff90a3
Merge branch 'main' of https://github.com/wesketchum/ldmxsw_docker
wesketchum Sep 28, 2023
8fd6c80
Merge branch 'main' of https://github.com/LDMX-Software/docker
wesketchum Jan 7, 2024
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
73 changes: 49 additions & 24 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,39 @@ RUN mkdir src && \
echo "${__prefix}/pythia${PYTHIA_MAJOR_VERSION}/" > /etc/ld.so.conf.d/pythia${PYTHIA_MAJOR_VERSION}.conf

SHELL ["/bin/sh", "-c"]
###############################################################################
# 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
###############################################################################
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does Pythia8 require rsync? Does it download stuff from servers during running?

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
Expand Down Expand Up @@ -214,6 +247,7 @@ RUN mkdir src &&\
-Dxrootd=OFF \
-Dgsl_shared=ON \
-Dmathmore=ON \
-Dpythia8=ON \
-Dpythia6=ON \
-DPYTHIA6_LIBRARY=${__prefix}/pythia6/libPythia6.so \
-B build \
Expand Down Expand Up @@ -294,25 +328,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.
###############################################################################
ENV LHAPDF_VERSION="6.5.3"
LABEL lhapdf.version=${LHAPDF_VERSION}
RUN mkdir src &&\
${__wget} https://lhapdf.hepforge.org/downloads/?f=LHAPDF-${LHAPDF_VERSION}.tar.gz |\
${__untar} &&\
cd src &&\
./configure --disable-python --prefix=${__prefix} &&\
make -j$NPROC install &&\
cd ../ &&\
rm -rf src

###############################################################################
# GENIE
#
Expand Down Expand Up @@ -344,9 +359,8 @@ RUN install-ubuntu-packages \
liblog4cpp5-dev \
libtool


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
#ENV GENIE_DOT_VERSION="$(sed 's,_,\.,g' <<< $GENIE_VERSION )"
LABEL genie.version=${GENIE_VERSION}
Expand All @@ -363,13 +377,24 @@ 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...
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed in the SW Dev meeting, we should change this to be a specific commit sha and if possible a specific human-readable tag made by the GENIE folks. Then (whichever path occurs), we should update ENV and LABEL with the version of GENIE Reweight installed.

something like

ENV GENIE_REWEIGHT_VERSION=1_02_03
LABEL genie_reweight.version=${GENIE_REWEIGHT_VERSION}

#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

SHELL ["/bin/sh", "-c"]

###############################################################################
Expand Down