Commit 6c2cb997 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'v2.0-patch' into 'v2.0-stable'

Prepare Patch Release v2.0.2

See merge request !534
parents 4add5f72 6dc3670b
Pipeline #3046713 passed with stages
in 26 minutes and 7 seconds
name: github-ci
name: compile&test
on:
pull_request:
types: [opened, reopened, edited, ready_for_review, synchronize]
......@@ -110,20 +110,3 @@ jobs:
chmod a+x bin/allpix
cd build
ctest -R ${{matrix.whichtest}} --output-on-failure -j4
format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: cvmfs-contrib/github-action-cvmfs@v2
- uses: aidasoft/run-lcg-view@v2
with:
run_local_checkout: 'false'
release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang10-opt"
run: |
mkdir build
cd build
cmake -GNinja -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_LCIOWriter=ON -DCMAKE_BUILD_TYPE=RELEASE -DLCIO_DIR=$LCIO_DIR ..
ninja check-format
name: format&lint
on:
pull_request:
types: [opened, reopened, edited, ready_for_review, synchronize]
env:
LCG_VERSION: LCG_99
jobs:
format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: cvmfs-contrib/github-action-cvmfs@v2
- uses: aidasoft/run-lcg-view@v2
with:
run_local_checkout: 'false'
release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang10-opt"
run: |
mkdir build
cd build
cmake -GNinja -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_LCIOWriter=ON -DCMAKE_BUILD_TYPE=RELEASE -DLCIO_DIR=$LCIO_DIR ..
ninja check-format
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: cvmfs-contrib/github-action-cvmfs@v2
- uses: aidasoft/run-lcg-view@v2
with:
run_local_checkout: 'false'
release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang10-opt"
run: |
mkdir build
cd build
cmake -GNinja -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_LCIOWriter=ON -DCMAKE_BUILD_TYPE=RELEASE -DLCIO_DIR=$LCIO_DIR ..
ninja check-lint
cmake-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: cvmfs-contrib/github-action-cvmfs@v2
- uses: aidasoft/run-lcg-view@v2
with:
run_local_checkout: 'false'
release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang10-opt"
run: |
mkdir build
cd build
export PATH=$PATH:~/.local/bin
pip install --trusted-host=pypi.org --user cmakelang
cmake -GNinja ..
ninja lint-cmake
#!/usr/bin/env python
#!/usr/bin/env python3
import os
import json
......@@ -12,7 +12,7 @@ api_token = sys.argv[1]
ci_project_id = sys.argv[2]
ci_pipeline_id = sys.argv[3]
print "Downloading job list"
print("Downloading job list")
data = json.load(os.popen("curl -g --header \"PRIVATE-TOKEN:%s\" \"https://gitlab.cern.ch/api/v4/projects/%s/pipelines/%s/jobs?scope[]=success&per_page=100\"" % (api_token, ci_project_id, ci_pipeline_id)))
# Find last passed builds
......@@ -20,6 +20,6 @@ for i in range(0, len(data)):
if "pkg:" not in data[i]['name']:
continue
print "Downloading artifact for job %s" % data[i]['id']
print("Downloading artifact for job %s" % data[i]['id'])
os.system("curl --location --header \"PRIVATE-TOKEN:%s\" \"https://gitlab.cern.ch/api/v4/projects/%s/jobs/%s/artifacts\" -o artifact.zip" % (api_token, ci_project_id, data[i]['id']))
os.system("unzip -j artifact.zip; rm artifact.zip")
#!/usr/bin/env python
#!/usr/bin/env python3
import sys
import lxml.etree as et
......
......@@ -13,7 +13,7 @@ IF(COMMAND CMAKE_POLICY)
ENDIF(COMMAND CMAKE_POLICY)
# Set default version
SET(ALLPIX_VERSION "v2.0.1")
SET(ALLPIX_VERSION "v2.0.2")
# Set default build type
IF(NOT CMAKE_BUILD_TYPE)
......
......@@ -230,12 +230,6 @@ TAB_SIZE = 4
ALIASES =
# This tag can be used to specify a number of word-keyword mappings (TCL only).
# A mapping has the form "name=value". For example adding "class=itcl::class"
# will allow you to use the command class in the itcl::class meaning.
TCL_SUBST =
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
......@@ -443,7 +437,7 @@ EXTRACT_PACKAGE = NO
# included in the documentation.
# The default value is: NO.
EXTRACT_STATIC = NO
EXTRACT_STATIC = YES
# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
# locally in source files will be included in the documentation. If set to NO,
......@@ -746,13 +740,13 @@ WARN_IF_DOC_ERROR = YES
# parameter documentation, but not about the absence of documentation.
# The default value is: NO.
WARN_NO_PARAMDOC = NO
WARN_NO_PARAMDOC = YES
# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
# a warning is encountered.
# The default value is: NO.
WARN_AS_ERROR = NO
WARN_AS_ERROR = YES
# The WARN_FORMAT tag determines the format of the warning messages that doxygen
# can produce. The string should contain the $file, $line, and $text tags, which
......@@ -781,7 +775,9 @@ WARN_LOGFILE =
# Note: If this tag is empty the current directory is searched.
INPUT = "@PROJECT_SOURCE_DIR@/src/" \
"@PROJECT_SOURCE_DIR@/tools/tcad_dfise_converter/" \
"@PROJECT_SOURCE_DIR@/tools/mesh_converter/" \
"@PROJECT_SOURCE_DIR@/tools/apf_tools/" \
"@PROJECT_SOURCE_DIR@/tools/weightingpotential_generator/" \
"@PROJECT_SOURCE_DIR@/doc/reference/README.md"
# This tag can be used to specify the character encoding of the source files
......@@ -2098,12 +2094,6 @@ EXTERNAL_GROUPS = YES
EXTERNAL_PAGES = YES
# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of 'which perl').
# The default file (with absolute path) is: /usr/bin/perl.
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
......@@ -2117,15 +2107,6 @@ PERL_PATH = /usr/bin/perl
CLASS_DIAGRAMS = YES
# You can define message sequence charts within doxygen comments using the \msc
# command. Doxygen will then run the mscgen tool (see:
# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
# documentation. The MSCGEN_PATH tag allows you to specify the directory where
# the mscgen tool resides. If left empty the tool is assumed to be found in the
# default search path.
MSCGEN_PATH =
# You can include diagrams made with dia in doxygen documentation. Doxygen will
# then run dia to produce the diagram and insert it in the documentation. The
# DIA_PATH tag allows you to specify the directory where the dia binary resides.
......
......@@ -120,7 +120,7 @@ for(auto& mc_particle : my_mc_particles) {
\end{minted}
A similar function is used e.g.\ in the DetectorHistogrammer module to filter primary particles and create position-resolved graphs.
Furthermore, the PixelHit object provides two member functions to access Monte Carlo particles, one which returns all known particles, \parameter{getMCParticles()}, and a second function called \parameter{getPrimaryMCParticles()} which already performs the above filtering and only returns primary particle references.
Furthermore, the PixelHit and PixelCharge objects provide two member functions to access Monte Carlo particles, one which returns all known particles, \parameter{getMCParticles()}, and a second function called \parameter{getPrimaryMCParticles()} which already performs the above filtering and only returns primary particle references.
\item[How do I access data stored in a file produced with the ROOTObjectWriter from an analysis script?]
\apsq uses ROOT trees to directly store the relevant \CPP objects as binary data in the file. This retains all information present during the simulation run, including relations between different objects such as assignment of Monte Carlo particles.
In order to read such a data file in an analysis script, the relevant \CPP library as well as its header have to be loaded.
......
[global]
type = "test"
position = 0 0 0
orientation = 0 0 0
[mydetector]
type = "test"
position = 0 0 0
orientation = 0 0 0
[mydetector]
type = "test"
position = 0 0 10mm
orientation = 0 0 0
[mydetector]
type = "test"
position = 0 0 0
orientation = 0 0 0
[mypassive]
type = "box"
position = 0 0 10mm
orientation = 0 0 0
role = "passive"
[mypassive]
type = "box"
position = 0 0 10mm
orientation = 0 0 0
role = "passive"
[Allpix]
detectors_file = "detector_missing_model.conf"
number_of_events = 1
random_seed = 0
log_level = PRNG
#PASS (PRNG) Using random number 2469588189546311528
#LABEL coverage
[Allpix]
detectors_file = "detector_twice.conf"
log_level = "TRACE"
number_of_events = 0
random_seed = 0
#PASS (FATAL) Error during execution of run:\nDetector with name mydetector is already registered, detector names have to be unique
#LABEL coverage
[Allpix]
detectors_file = "detector_twice_passive.conf"
log_level = "TRACE"
number_of_events = 0
random_seed = 0
#PASS (FATAL) Error during execution of run:\nElement with name mypassive is already registered, element names have to be unique
#LABEL coverage
[Allpix]
detectors_file = "detector_invalid.conf"
number_of_events = 1
random_seed = 0
#PASS (FATAL) Error during execution of run:\nDetector name global is invalid, choose a different name
#LABEL coverage
[Allpix]
detectors_file = "detector.conf"
log_level = "TRACE"
number_of_events = 0
random_seed = 0
[DefaultDigitizer]
name = "missing_detector"
#PASS (FATAL) Error during execution of run:\nCould not find a detector with name 'missing_detector'
#LABEL coverage
[Allpix]
detectors_file = "detector.conf"
number_of_events = 1
random_seed = 0
[ROOTObjectWriter]
include = PixelHit
exclude = PixelCharge
#PASS (FATAL) [I:ROOTObjectWriter] Error in the configuration:\nCombination of keys 'exclude', 'include', in section 'ROOTObjectWriter' is not valid: include and exclude parameter are mutually exclusive
#LABEL coverage
[Allpix]
number_of_events = 1
random_seed = 0
unused_key = 5
#PASS (FATAL) Error in the configuration:\nKey 'detectors_file' in global section does not exist
#LABEL coverage
[Allpix]
detectors_file = "detector.conf"
number_of_events = 1
random_seed = 0
[DopingProfileReader]
model = "regions"
doping_concentration = [10, 11], [12, 13]
#PASS (INFO) [I:DopingProfileReader:mydetector] Set constant doping concentration of 13000/cm/cm/cm at sensor depth 12mm
#LABEL coverage
[Allpix]
detectors_file = "detector.conf"
number_of_events = 1
random_seed = 0
[DopingProfileReader]
model = "regions"
doping_concentration = 12, 12
#PASS (FATAL) [I:DopingProfileReader:mydetector] Error in the configuration:\nCould not convert value '12, 12' from key 'doping_concentration' in section 'DopingProfileReader' to type double: matrix has less than two dimensions, enclosing brackets might be missing
#LABEL coverage
[Allpix]
detectors_file = "detector.conf"
number_of_events = 1
random_seed = 0
multithreading = true
workers = 3
[DepositionPointCharge]
model = "fixed"
source_type = "point"
position = 0,0,0
[DopingProfileReader]
model = "constant"
doping_concentration = 1
[GenericPropagation]
temperature = 293K
charge_per_step = 100
recombination_model = "srh"
log_level = DEBUG
propagate_electrons = true
propagate_holes = true
#PASS (DEBUG) [I:GenericPropagation:mydetector] Selected recombination model "srh"
#LABEL coverage
#FAIL ERROR
#FAIL FATAL
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment