Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(gx2f): material effects - multiple scattering #3292

Merged
merged 88 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from 84 commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
749f24a
extended addToGx2fSums
AJPfleger Jun 14, 2024
631568f
add scatteringMap framework
AJPfleger Jun 14, 2024
492b8c6
other changes
AJPfleger Jun 14, 2024
e5b42bb
clean geoIdVector filling
AJPfleger Jun 14, 2024
447618d
missed changes
AJPfleger Jun 14, 2024
1199bfb
enable UT
AJPfleger Jun 14, 2024
14bdd7b
contribution from angle
AJPfleger Jun 14, 2024
4c55793
add material collection
AJPfleger Jun 14, 2024
031bcb8
mask
AJPfleger Jun 14, 2024
19f506d
constant mask
AJPfleger Jun 14, 2024
4677c2c
working example
AJPfleger Jun 14, 2024
dd9dcbb
fix segfault
AJPfleger Jun 14, 2024
e03d605
clean0C calculateDeltaParams - unused?
AJPfleger Jun 14, 2024
cf5a7ec
fix
AJPfleger Jun 14, 2024
1e8fdc2
add DEBUG cout
AJPfleger Jun 14, 2024
65587b7
Merge branch 'main' into gx2f-material
AJPfleger Jun 14, 2024
e960345
test explicit
AJPfleger Jun 14, 2024
41c33c7
disable mixed detector
AJPfleger Jun 15, 2024
91ba1a1
fix 1 dim measurement
AJPfleger Jun 15, 2024
5a2c9fd
more debugging
AJPfleger Jun 15, 2024
ad8157f
try transpose
AJPfleger Jun 15, 2024
de963a4
fix jacobian transpose in bVector
AJPfleger Jun 15, 2024
fd144aa
physmon
AJPfleger Jun 15, 2024
fb3d9c9
Merge branch 'main' into gx2f-material
AJPfleger Jun 15, 2024
36d116f
fix?
AJPfleger Jun 15, 2024
5a119a0
better assumption
AJPfleger Jun 15, 2024
7bc9d42
minus sign
AJPfleger Jun 15, 2024
44e830c
bad variant
AJPfleger Jun 15, 2024
6d245fd
not enough measurements
AJPfleger Jun 15, 2024
19b4417
fix not enough measurements
AJPfleger Jun 15, 2024
f615ed4
disable test
AJPfleger Jun 15, 2024
2a387f9
Merge branch 'main' into gx2f-material
AJPfleger Jun 16, 2024
d319b31
more updates
AJPfleger Jun 17, 2024
28cc00d
more details
AJPfleger Jun 17, 2024
f0b690c
refactor jacobianFromStart
AJPfleger Jun 18, 2024
6371958
Merge branch 'main' into gx2f-material
AJPfleger Jun 23, 2024
e557835
Merge branch 'main' into gx2f-material
AJPfleger Aug 2, 2024
ef5a217
materialSlab and correct angles
AJPfleger Aug 5, 2024
377c1af
Merge branch 'main' into gx2f-material
AJPfleger Aug 5, 2024
4709d1d
fix angle
AJPfleger Aug 6, 2024
2b312ff
monoton converg
AJPfleger Aug 6, 2024
c3b138c
speed up physmon check
AJPfleger Aug 6, 2024
54294e5
revert physmon
AJPfleger Aug 9, 2024
8fbaad3
Merge branch 'main' into gx2f-material
AJPfleger Aug 9, 2024
b2504c7
future slabs
AJPfleger Aug 9, 2024
44933df
make toggle-able
AJPfleger Aug 9, 2024
7b3a99a
format
AJPfleger Aug 9, 2024
3173f7a
Update Gx2fTests.cpp
AJPfleger Aug 9, 2024
97e625e
revert most of gx2f to e557835
AJPfleger Aug 12, 2024
2d53080
flag multipleScattering
AJPfleger Aug 12, 2024
138e616
parameterFlag
AJPfleger Aug 12, 2024
3da6488
revert more
AJPfleger Aug 12, 2024
2f60132
split: handle first material and then holes
AJPfleger Aug 12, 2024
5bdf109
add material flag for non-scattering
AJPfleger Aug 12, 2024
4d32855
create full statehandling with material for MS=false
AJPfleger Aug 12, 2024
fdc69ee
simplify hole handling
AJPfleger Aug 12, 2024
b094e0a
detach material from holes
AJPfleger Aug 12, 2024
f536220
Revert "detach material from holes"
AJPfleger Aug 13, 2024
5c23198
re-add simple scattering
AJPfleger Aug 13, 2024
d55386d
turn scattering off in physmon
AJPfleger Aug 13, 2024
9899636
reasamble material
AJPfleger Aug 14, 2024
5f05631
account for invalid material (vacuum, 0 thickness, ...)
AJPfleger Aug 15, 2024
d129d13
scatter only at measurement
AJPfleger Aug 16, 2024
48b87ef
probe ODD
AJPfleger Aug 16, 2024
f2b87bf
fix residuals
AJPfleger Aug 22, 2024
563a4b4
-Werror=null-dereference
AJPfleger Aug 22, 2024
9f165d6
stabilise
AJPfleger Aug 22, 2024
a8a832f
disable test didNotConverge
AJPfleger Aug 22, 2024
e04b8ea
scattering contribution to chi2
AJPfleger Aug 23, 2024
804db25
Merge branch 'main' into gx2f-material
AJPfleger Aug 26, 2024
2823153
Merge branch 'main' into gx2f-material
AJPfleger Aug 26, 2024
9005a9f
Merge branch 'main' into gx2f-material
AJPfleger Aug 26, 2024
799b994
Merge branch 'main' into gx2f-material
AJPfleger Aug 27, 2024
71bc8df
documentation and refactor
AJPfleger Aug 27, 2024
9aa8b3a
Merge branch 'main' into gx2f-material
AJPfleger Aug 28, 2024
b11c5f6
Merge branch 'main' into gx2f-material
AJPfleger Aug 29, 2024
0f9ce36
sonarcloud
AJPfleger Aug 28, 2024
83012ce
make fucntion for addMaterialToGx2fSums
AJPfleger Aug 29, 2024
80713c8
finish implementation
AJPfleger Aug 29, 2024
1d6ad56
Merge branch 'main' into gx2f-material
AJPfleger Aug 29, 2024
b7783d0
clean up p1
AJPfleger Aug 29, 2024
9ac9c1b
review: scatteringAngles struct
AJPfleger Aug 29, 2024
e08f208
review: visit_measurement
AJPfleger Aug 29, 2024
2076e9e
docs
AJPfleger Aug 30, 2024
5906f79
review number 2 andiwand
AJPfleger Aug 30, 2024
adb9146
update hashes
AJPfleger Aug 30, 2024
cde7d88
Merge branch 'main' into gx2f-material
AJPfleger Aug 30, 2024
dfd18c7
Merge branch 'main' into gx2f-material
kodiakhq[bot] Aug 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions .github/workflows/builds.yml
AJPfleger marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,20 @@ jobs:
name: acts-linux-ubuntu
path: build.tar.gz

- name: Downstream configure
run: >
cmake -B build-downstream -S Tests/DownstreamProject
-GNinja
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DCMAKE_CXX_STANDARD=20
-DCMAKE_PREFIX_PATH="${INSTALL_DIR}"

- name: Downstream build
run: cmake --build build-downstream

- name: Downstream run
run: ./build-downstream/bin/ShowActsVersion
# - name: Downstream configure
# run: >
# cmake -B build-downstream -S Tests/DownstreamProject
# -GNinja
# -DCMAKE_BUILD_TYPE=Release
# -DCMAKE_CXX_FLAGS=-Werror
# -DCMAKE_CXX_STANDARD=20
# -DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
#
# - name: Downstream build
# run: cmake --build build-downstream
#
# - name: Downstream run
# run: ./build-downstream/bin/ShowActsVersion

linux_examples_test:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -148,6 +148,7 @@ jobs:
container: ghcr.io/acts-project/ubuntu2404:58
needs: [linux_ubuntu]
env:
ACTIONS_RUNNER_DEBUG: true
ACTS_SEQUENCER_DISABLE_FPEMON: true

steps:
Expand Down Expand Up @@ -183,7 +184,7 @@ jobs:
&& /usr/local/bin/geant4-config --install-datasets
&& source build/this_acts_withdeps.sh
&& echo "::endgroup::"
&& CI/physmon/phys_perf_mon.sh all physmon
&& CI/physmon/phys_perf_mon.sh gx2f physmon

- name: Post step summary
if: always()
Expand Down
Loading
Loading