Commit 190de595 authored by Stephan Lachnit's avatar Stephan Lachnit
Browse files

Merge branch 'b-lcg102' into 'v2.4-stable' 

[v2.4-stable] Switch to LCG_102

See merge request allpix-squared/allpix-squared!921
parents adc7051d 87f35015

.ci/init_x86_64.sh

+5 −3
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ if [ "$(uname)" = "Linux" ]; then 
elif [ "$(uname)" = "Darwin" ]; then

    MACOS_MAJOR=$(sw_vers -productVersion | awk -F '.' '{print $1}')

    MACOS_MINOR=$(sw_vers -productVersion | awk -F '.' '{print $2}')

    if [ $MACOS_MAJOR = "11" ]; then

    if [ $MACOS_MAJOR = "12" ]; then

        OS=mac12

    elif [ $MACOS_MAJOR = "11" ]; then

        OS=mac11

    elif [ "${MACOS_MAJOR}.${MACOS_MINOR}" = "10.15" ]; then

        OS=mac1015
@@ -30,7 +32,7 @@ fi 


# Determine is you have CVMFS installed

CVMFS_MOUNT=""

if [ "$OS" = mac1015 ] || [ "$OS" = mac11 ] ; then

if [ "$OS" = mac1015 ] || [ "$OS" = mac11 ] || [ "$OS" = mac12] ; then

    CVMFS_MOUNT="/Users/Shared"

fi
@@ -50,7 +52,7 @@ fi 




# Determine which LCG version to use

DEFAULT_LCG="LCG_101"

DEFAULT_LCG="LCG_102"



if [ -z ${ALLPIX_LCG_VERSION} ]; then

    echo "No explicit LCG version set, using ${DEFAULT_LCG}."

.github/workflows/compilation-and-test.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ on: 
  pull_request:

    types: [opened, reopened, edited, ready_for_review, synchronize]

env:

  LCG_VERSION: LCG_101

  LCG_VERSION: LCG_102

jobs:

  compile-centos7:

    strategy:

.github/workflows/format-and-lint.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ on: 
  pull_request:

    types: [opened, reopened, edited, ready_for_review, synchronize]

env:

  LCG_VERSION: LCG_101

  LCG_VERSION: LCG_102

jobs:



  format:

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line 
variables:

    DOCKER_DEPS_IMAGE: "gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v2"

    EOS_PATH: "/eos/project/a/allpix-squared/www/"

    DOCKER_FILE: etc/docker/Dockerfile
@@ -37,7 +38,7 @@ stages: 
        - mkdir -p build/ && cd build/



.docker:

    image: gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:latest

    image: $DOCKER_DEPS_IMAGE

    tags:

        - docker

    before_script:

doc/usermanual/chapters/installation.tex

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ A recommended set of CMake flags to build a Geant4 package suitable for usage wi 
-DGEANT4_USE_SYSTEM_CLHEP=OFF

-DGEANT4_BUILD_CXXSTD=17

-DGEANT4_BUILD_MULTITHREADED=ON

-DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF

\end{verbatim}

\item Eigen3~\cite{eigen3}: Vector package used to perform Runge-Kutta integration, used in some of the charge carrier propagation modules.

Eigen is available in almost all Linux distributions through the package manager.