Commit 849d33a2 authored by Håkan Wennlöf's avatar Håkan Wennlöf
Browse files

Merge branch 'v3.0-stable' into 'b-creation' 

# Conflicts:
#   etc/unittests/test_core/test_06-8_multithreading_buffered.conf
parents 122fd91f 2cde80f6

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -44,3 +44,6 @@ 


# Ignore files created from unit tests

/etc/unittests/output/



# Ignore merge conflict original copies

*.orig

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ deploy:cvmfs: 
.deploy-docker:

    stage: deployment

    image:

        name: gitlab-registry.cern.ch/ci-tools/docker-image-builder

        name: gcr.io/kaniko-project/executor:debug

        entrypoint: [""]

    dependencies: []

    script:

doc/usermanual/07_objects/01_object_types.md

+10 −0
Original line number Diff line number Diff line
@@ -122,6 +122,11 @@ Main parameters: 
- The [MCParticle](#mcparticle) that created the deposited charge

  ([`getMCParticle()`](https://allpix-squared.docs.cern.ch/reference/classes/classallpix_1_1depositedcharge/#function-getmcparticle))



{{% alert title="Warning" color="warning" %}}

It should be noted that in most cases, storage of DepositedCharge objects is not required. Since individual objects are

generated for every electron and hole in the event, storing them will lead to large output files and possible performance penalties.

{{% /alert %}}



For more details refer to the [code reference](https://allpix-squared.docs.cern.ch/reference/classes/classallpix_1_1depositedcharge/).



## PropagatedCharge
@@ -164,6 +169,11 @@ The following values for the carrier state are possible: 
- `CarrierState::HALTED`:

  The motion of the charge carrier has stopped, for example because it has reached an implant or the sensor surface



{{% alert title="Warning" color="warning" %}}

It should be noted that in most cases, storage of PropagatedCharge objects is not required. Since individual objects are

generated for every electron and hole in the event, storing them will lead to large output files and possible performance penalties.

{{% /alert %}}



For more details refer to the [code reference](https://allpix-squared.docs.cern.ch/reference/classes/classallpix_1_1propagatedcharge/).



## PixelCharge

etc/unittests/CMakeLists.txt

+10 −4
Original line number Diff line number Diff line
@@ -13,8 +13,11 @@ IF(TEST_PERFORMANCE) 
    LIST(LENGTH TEST_LIST_PERFORMANCE NUM_TEST_PERFORMANCE)

    SET_PROPERTY(GLOBAL PROPERTY COUNT_TESTS_PERFORMANCE "${NUM_TEST_PERFORMANCE}")

    FOREACH(test ${TEST_LIST_PERFORMANCE})

        GET_FILENAME_COMPONENT(ext ${test} LAST_EXT)

        IF("${ext}" STREQUAL ".conf")

            GET_FILENAME_COMPONENT(title ${test} NAME_WE)

            ADD_ALLPIX_TEST(NAME "performance/${title}" FILE ${CMAKE_CURRENT_SOURCE_DIR}/${test})

        ENDIF()

    ENDFOREACH()

    SET_PROPERTY(GLOBAL PROPERTY PERF_TEST_DESCRIPTIONS "${TEST_DESCRIPTIONS}")

    SET(TEST_DESCRIPTIONS "")
@@ -32,8 +35,11 @@ IF(TEST_CORE) 
    LIST(LENGTH TEST_LIST_CORE NUM_TEST_CORE)

    SET_PROPERTY(GLOBAL PROPERTY COUNT_TESTS_CORE "${NUM_TEST_CORE}")

    FOREACH(test ${TEST_LIST_CORE})

        GET_FILENAME_COMPONENT(ext ${test} LAST_EXT)

        IF("${ext}" STREQUAL ".conf")

            GET_FILENAME_COMPONENT(title ${test} NAME_WE)

            ADD_ALLPIX_TEST(NAME "core/${title}" FILE ${CMAKE_CURRENT_SOURCE_DIR}/${test})

        ENDIF()

    ENDFOREACH()

    SET_PROPERTY(GLOBAL PROPERTY CORE_TEST_DESCRIPTIONS "${TEST_DESCRIPTIONS}")

    SET(TEST_DESCRIPTIONS "")

etc/unittests/test_core/test_06-8_multithreading_buffered.conf

+2 −1
Original line number Diff line number Diff line
@@ -36,5 +36,6 @@ propagate_holes = true 


[ROOTObjectWriter]

log_level = DEBUG

exclude = DepositedCharge, PropagatedCharge



#PASS (STATUS) [F:ROOTObjectWriter] Wrote 46070 objects to 8 branches in file
 
#PASS (STATUS) [F:ROOTObjectWriter] Wrote 94 objects to 6 branches in file