Merge branch 'master' into 'laser' (bd8cf962) · Commits · XRFLab109 / Allpix Squared

.gitlab-ci.yml

+8 −1

Original line number	Diff line number	Diff line
		@@ -3,10 +3,17 @@

		variables:
		REPOSITORY: "https://gitlab.cern.ch/allpix-squared/allpix-squared.git"
		DOCKER_DEPS_IMAGE: "gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v2"
		DOCKER_DEPS_IMAGE: "gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v3"
		EOS_PATH: "/eos/project/a/allpix-squared/www/"
		DOCKER_FILE: etc/docker/Dockerfile

		default:
		retry:
		max: 2
		when:
		- stuck_or_timeout_failure
		- runner_system_failure

		stages:
		- compilation
		- testing

+35 −10

Original line number	Diff line number	Diff line
		@@ -981,8 +981,33 @@ journal = {Progress in Photovoltaics: Research and Applications},
		volume = {3},
		number = {3},
		pages = {189-192},
		doi = {https://doi.org/10.1002/pip.4670030303},
		doi = {10.1002/pip.4670030303},
		url = {https://onlinelibrary.wiley.com/doi/abs/10.1002/pip.4670030303},
		eprint = {https://onlinelibrary.wiley.com/doi/pdf/10.1002/pip.4670030303},
		year = {1995}
		}

		@article{genie,
		author = "Andreopoulos, C. and others",
		title = "{The GENIE Neutrino Monte Carlo Generator}",
		eprint = "0905.2517",
		archivePrefix = "arXiv",
		primaryClass = "hep-ph",
		reportNumber = "FERMILAB-PUB-09-418-CD",
		doi = "10.1016/j.nima.2009.12.009",
		journal = "Nucl. Instrum. Meth. A",
		volume = "614",
		pages = "87--104",
		year = "2010"
		}

		@article{hepmc3,
		title = {The HepMC3 event record library for Monte Carlo event generators},
		journal = {Comp. Phys. Comm.},
		volume = {260},
		pages = {107310},
		year = {2021},
		issn = {0010-4655},
		doi = {doi.org/10.1016/j.cpc.2020.107310},
		url = {https://www.sciencedirect.com/science/article/pii/S0010465520301181},
		author = {Andy Buckley and Philip Ilten and Dmitri Konstantinov and Leif Lönnblad and James Monk and Witold Pokorski and Tomasz Przedzinski and Andrii Verbytskyi},
		}

+4 −2

Original line number	Diff line number	Diff line
		# SPDX-FileCopyrightText: 2018-2022 CERN and the Allpix Squared authors
		# SPDX-License-Identifier: MIT

		FROM gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v2
		FROM gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v3
		MAINTAINER Simon Spannagel <simon.spannagel@cern.ch>
		ARG ALLPIX_BUILD_ENV="Docker"

		@@ -15,7 +15,9 @@ WORKDIR "/data"
		RUN mkdir -p /tmp/allpix-squared/build && \
		cd /tmp/allpix-squared/build && \
		cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ \
		-DBUILD_ALL_MODULES=ON \
		-DBUILD_DatabaseWriter=ON \
		-DBUILD_LCIOWriter=ON \
		-DBUILD_VisualizationGeant4=OFF \
		.. && \
		make -j`grep -c processor /proc/cpuinfo` && \
		make install && \

+22 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,28 @@ RUN mkdir -p ${GEANT4DIR}/{src,build} && \
		rm -rf ${GEANT4DIR}/{src,build} && \
		rm -rf ${GEANT4DIR}/share/Geant4-${GEANT4_VERSION_PATH}/examples

		# Add layer for HepMC3
		ENV HEPMC3_VERSION 3.2.5

		ENV HEPMC3DIR="/opt/hepmc3"
		ENV PATH="$HEPMC3DIR/bin:$PATH"
		ENV LD_LIBRARY_PATH="$HEPMC3DIR/lib:$LD_LIBRARY_PATH"
		ENV LIBPATH="$HEPMC3DIR/lib:$LIBPATH"
		ENV CMAKE_PREFIX_PATH="$HEPMC3DIR:$CMAKE_PREFIX_PATH"

		RUN mkdir -p ${HEPMC3DIR}/{src,build} && \
		curl -o ${HEPMC3DIR}/hepmc3.${HEPMC3_VERSION}.tar.gz \
		https://gitlab.cern.ch/hepmc/HepMC3/-/archive/${HEPMC3_VERSION}/HepMC3-${HEPMC3_VERSION}.tar.gz && \
		tar zxf ${HEPMC3DIR}/hepmc3.${HEPMC3_VERSION}.tar.gz -C ${HEPMC3DIR}/src && \
		rm -f ${HEPMC3DIR}/hepmc3.${HEPMC3_VERSION}.tar.gz && \
		cd ${HEPMC3DIR}/build && \
		cmake -DCMAKE_INSTALL_PREFIX=../ \
		-DHEPMC3_ENABLE_ROOTIO=ON \
		-DHEPMC3_ENABLE_PYTHON=ON \
		../src/HepMC3-${HEPMC3_VERSION} && \
		make -j`grep -c processor /proc/cpuinfo` && \
		make install && \
		rm -rf ${HEPMC3DIR}/{src,build}

		# Install Allpix Squared dependencies
		RUN apt-get install -y libpqxx-dev postgresql-server-dev-all libeigen3-dev libboost-random-dev python3-lxml git

+1 −1

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ if __name__ == '__main__':
		args = parser.parse_args()

		# Seed PRNG with provided seed
		if args.type is not None:
		if args.seed is not None:
		random.seed(args.seed)

		# Check for availability of ROOT