Commit ec5b9901 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'master' into 'dynamicChargePerStep' 

# Conflicts:
#   src/modules/GenericPropagation/README.md
#   src/modules/TransientPropagation/README.md
parents a2dbe9b7 680fc61c

.editorconfig

+2 −1
Original line number Diff line number Diff line
@@ -14,4 +14,5 @@ indent_style = space 
indent_size = 4



[*.md]

trim_trailing_whitespace = false
 
indent_style = space

indent_size = 2

.gitignore

+5 −1
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
.*

\#*



# Some exceptions for the doc folder

!/doc/**/*.png

!/doc/**/.gitignore



# ignore python byte code

*.pyc

.gitlab-ci.yml

+31 −40
Original line number Diff line number Diff line
@@ -433,40 +433,43 @@ perf:cc7-gcc: 
    tags:

        - docker

    before_script:

        - mkdir -p public/usermanual

        - mkdir -p result

        - mkdir build && cd build

    artifacts:

        paths:

            - public

            - result

        expire_in: 24 hour



# Compile Doxygen reference

cmp:doxygen:

docs:doxygen:

    extends: .doc

    image: gitlab-registry.cern.ch/sft/docker/centos7:latest

    script:

        - source ../.ci/init_x86_64.sh

        - cmake -GNinja -DBUILD_DOCS_ONLY=ON ..

        - ninja apsq_docs_reference

        - mv doc/reference/html ../result/reference



# Create file tree for hugo

docs:usermanual-hugo:

    extends: .doc

    image: gitlab-registry.cern.ch/sft/docker/centos7:latest

    script:

        - source ../.ci/init_x86_64.sh

        - cmake -DBUILD_DOCS_ONLY=ON ..

        - make Allpix-reference 1> /dev/null

        - mv reference/html ../public/reference

        - cmake -GNinja -DBUILD_DOCS_ONLY=ON ..

        - ninja apsq_docs_hugo

        - mv doc/usermanual_hugo ../result/usermanual_hugo



# Compile LaTeX user manual:

cmp:usermanual:

docs:usermanual-pdf:

    extends: .doc

    image: gitlab-registry.cern.ch/clicdp/publications/templates/custom_ci_worker:fedora-latex-latest

    image: thomasweise/docker-texlive-full:latest

    script:

        - cmake -DBUILD_DOCS_ONLY=ON ..

        - make pdf

        - make html

        - mv usermanual/*.html ../public/usermanual

        - mv usermanual/*.css ../public/usermanual

        - mv usermanual/logo.png ../public/usermanual

        - mv usermanual/allpix-manual.pdf ../public/usermanual

        - mkdir -p ../public/usermanual/usermanual/

        - mkdir -p ../public/usermanual/usermanual/html/

        - mv usermanual/usermanual/html/css ../public/usermanual/usermanual/html/

        - mv usermanual/usermanual/html/js ../public/usermanual/usermanual/html/

        - mv usermanual/usermanual/figures ../public/usermanual/usermanual/

        - apt update && apt install -y cmake ninja-build python3-yaml pandoc

        - pandoc --version

        - cmake -GNinja -DBUILD_DOCS_ONLY=ON ..

        - ninja apsq_docs_pdf

        - mv doc/usermanual_pdf/allpix-manual.pdf ../result/allpix-manual.pdf





################################
@@ -533,27 +536,15 @@ pkg:macos-clang: 


# Automatically deploy documentation to the website

# Deployment job only executed for new tag pushs, not for every commit.

deploy-documentation:

deploy:documentation:

    stage: deployment

    tags:

      - docker

    variables:

        GIT_STRATEGY: none

    # Only run for new tags:

    only:

        - tags@allpix-squared/allpix-squared

    dependencies:

        - cmp:usermanual

        - cmp:doxygen

    # Docker image with tools to deploy to EOS

    image: gitlab-registry.cern.ch/ci-tools/ci-web-deployer:latest

    script:

        - deploy-eos

    # do not run any globally defined before_script or after_script for this step

    before_script: []

    after_script: []

    trigger:

        project: allpix-squared/allpix-squared-website

        strategy: depend



deploy-eos:

deploy:eos:

    stage: deployment

    tags:

      - docker
@@ -576,7 +567,7 @@ deploy-eos: 
    before_script: []

    after_script: []



deploy-cvmfs:

deploy:cvmfs:

    stage: deployment

    dependencies:

        - pkg:cc7-gcc
@@ -607,7 +598,7 @@ deploy-cvmfs: 
        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/$DOCKER_FILE --destination $IMAGE_DESTINATION --build-arg ALLPIX_BUILD_ENV="$ALLPIX_BUILD_ENV"

        - echo "Image pushed successfully to ${IMAGE_DESTINATION}"



deploy-docker-latest:

deploy:docker-latest:

    extends: .deploy-docker

    variables:

        IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}:latest
@@ -615,7 +606,7 @@ deploy-docker-latest: 
    only:

        - schedules@allpix-squared/allpix-squared



deploy-docker-tag:

deploy:docker-tag:

    extends: .deploy-docker

    variables:

        IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

.reuse/dep5

+6 −6
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ Files: cmake/CodeCoverage.cmake 
Copyright: 2012 - 2017, Lars Bilke

License: BSD-3-Clause



Files: cmake/LATEX.cmake

Copyright: 2004, 2015 Sandia Corporation

License: BSD-3-Clause

Files: doc/convert/pandoc-gitlab-math.lua

Copyright: 2018 Nikolay Yakimov

License: MIT



Files: cmake/PANDOC.cmake

Copyright: 2015 Jeet Sukumaran <jeetsukumaran@gmail.com>

License: BSD-3-Clause

Files: doc/convert/pandoc-minted.lua

Copyright: 2019 Stephen McDowell

License: MIT



Files: doc/*

Copyright: 2016-2022 CERN and the Allpix Squared authors

AUTHORS.md

0 → 100644
+64 −0
Original line number Diff line number Diff line 
---

# SPDX-FileCopyrightText: 2022 CERN and the Allpix Squared authors

# SPDX-License-Identifier: CC-BY-4.0

title: "Acknowledgments"

---



Allpix Squared is developed and maintained by



* Paul Schütze, DESY, [pschutze](https://gitlab.cern.ch/pschutze)

* Simon Spannagel, DESY, [simonspa](https://gitlab.cern.ch/simonspa)

* Koen Wolters, [kwolters](https://gitlab.cern.ch/kwolters)



The following authors, in alphabetical order, have developed or contributed to Allpix Squared:



* Mohamed Moanis Ali, GSOC2019 Student, [mmoanis](https://github.com/mmoanis)

* Mathieu Benoit, BNL, [mbenoit](https://gitlab.cern.ch/mbenoit)

* Thomas Billoud, Université de Montréal, [tbilloud](https://gitlab.cern.ch/tbilloud)

* Tobias Bisanz, CERN, [tbisanz](https://gitlab.cern.ch/tbisanz)

* Marco Bomben, Université de Paris, [mbomben](https://gitlab.cern.ch/mbomben)

* Koen van den Brandt, Nikhef, [kvandenb](https://gitlab.cern.ch/kvandenb)

* Carsten Daniel Burgard, DESY, [cburgard](https://gitlab.cern.ch/cburgard)

* Maximilian Felix Caspar, DESY, [mcaspar](https://gitlab.cern.ch/mcaspar)

* Liejian Chen, Institute of High Energy Physics Beijing, [chenlj](https://github.com/chenlj)

* Manuel Alejandro Del Rio Viera, DESY, [mdelriov](https://gitlab.cern.ch/mdelriov)

* Katharina Dort, University of Gießen, [kdort](https://gitlab.cern.ch/kdort)

* Neal Gauvin, Université de Genève, [ngauvin](https://gitlab.cern.ch/ngauvin)

* Lennart Huth, DESY, [lhuth](https://gitlab.cern.ch/lhuth)

* Daniel Hynds, University of Oxford, [dhynds](https://gitlab.cern.ch/dhynds)

* Maoqiang Jing, Institute of High Energy Physics Beijing, [mjing](https://gitlab.cern.ch/mjing)

* Moritz Kiehn, Université de Genève, [msmk](https://gitlab.cern.ch/msmk)

* Rafaella Eleni Kotitsa, CERN, [rkotitsa](https://gitlab.cern.ch/rkotitsa)

* Stephan Lachnit, DESY, [slachnit](https://gitlab.cern.ch/slachnit)

* Salman Maqbool, CERN Summer Student, [smaqbool](https://gitlab.cern.ch/smaqbool)

* Stefano Mersi, CERN, [mersi](https://gitlab.cern.ch/mersi)

* Ryuji Moriya, CERN Summer Student, University of Glasgow, [rmoriya](https://gitlab.cern.ch/rmoriya)

* Sebastien Murphy, ETHZ, [smurphy](https://gitlab.cern.ch/smurphy)

* Andreas Matthias Nürnberg, KIT, [nurnberg](https://gitlab.cern.ch/nurnberg)

* Sebastian Pape, TU Dortmund University, [spape](https://gitlab.cern.ch/spape)

* Marko Petric, CERN, [mpetric](https://gitlab.cern.ch/mpetric)

* Radek Privara, Palacky University Olomouc, [rprivara](https://gitlab.cern.ch/rprivara)

* Nashad Rahman, The Ohio State University, [nashadroid](https://github.com/nashadroid)

* Sabita Rao, GSDocs2020 Student, [srao](https://gitlab.cern.ch/srao)

* Edoardo Rossi, DESY, [edrossi](https://gitlab.cern.ch/edrossi)

* Jihad Saidi, Université de Genève, [jisaidi](https://gitlab.cern.ch/jisaidi)

* Andre Sailer, CERN, [sailer](https://gitlab.cern.ch/sailer)

* Enrico Jr. Schioppa, Unisalento and INFN Lecce, [schioppa](https://gitlab.cern.ch/schioppa)

* Sebastian Schmidt, FAU Erlangen, [schmidtseb](https://github.com/schmidtseb)

* Sanchit Sharma, Kansas State University, [SanchitKratos](https://github.com/SanchitKratos)

* Xin Shi, Institute of High Energy Physics Beijing, [xshi](https://gitlab.cern.ch/xshi)

* Petr Smolyanskiy, Czech Technical Univbersity Prague, [psmolyan](https://gitlab.cern.ch/psmolyan)

* Viktor Sonesten, GSOC2018 Student, [tmplt](https://github.com/tmplt)

* Reem Taibah, Université de Paris, [retaibah](https://gitlab.cern.ch/retaibah)

* Ondrej Theiner, Charles University, [otheiner](https://gitlab.cern.ch/otheiner)

* Annika Vauth, University of Hamburg, [avauth](https://gitlab.cern.ch/avauth)

* Mateus Vicente Barreto Pinto, CERN, [mvicente](https://gitlab.cern.ch/mvicente)

* Håkan Wennlöf, DESY, [hwennlof](https://gitlab.cern.ch/hwennlof)

* Andy Wharton, Lancaster University, [awharton](https://gitlab.cern.ch/awharton)

* Morag Williams, University of Glasgow, [williamm](https://gitlab.cern.ch/williamm)



The authors would also like to express their thanks to the developers of AllPix \[[@ap1wiki], [@ap1git]\].





[@ap1wiki]: https://twiki.cern.ch/twiki/bin/view/Main/AllPix

[@ap1git]: https://github.com/ALLPix/allpix