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.

Sign up for GitHub

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

ci: Change particles in GSF script to electrons and enable interactions #1916

Merged
merged 6 commits into from
Mar 8, 2023
Merged

ci: Change particles in GSF script to electrons and enable interactions #1916

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f381a05
change particles to electrons and enable interactions
benjaminhuth Mar 2, 2023
0c4a4a7
fix FPE
benjaminhuth Mar 7, 2023
37d204d
Merge branch 'main' into ci/gsf-electrons-interactions
benjaminhuth Mar 7, 2023
a13a71a
fix the fix, add new reference file
benjaminhuth Mar 7, 2023
f18d16d
update hashes
benjaminhuth Mar 7, 2023
10194e8
Merge branch 'main' into ci/gsf-electrons-interactions
kodiakhq[bot] Mar 8, 2023
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
Binary file modified CI/physmon/reference/performance_gsf.root
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions Examples/Python/tests/root_file_hashes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ test_truth_tracking_kalman[odd-0.0]__performance_track_finder.root: dacf32346bca
test_truth_tracking_kalman[odd-1000.0]__trackstates_fitter.root: c76b77c50bd054594d0fc8dd5262a602f1c38c49611f6b975a60e77a83eb6525
test_truth_tracking_kalman[odd-1000.0]__tracksummary_fitter.root: 0f26a2e7c67407e0c7092b2d861753d658529147ff2dc4ea968a9c9f28a19bf9
test_truth_tracking_kalman[odd-1000.0]__performance_track_finder.root: dacf32346bca4c7010ca6a21f4868e2a9cdbc764d0918cb498cefdf322567716
test_truth_tracking_gsf[generic]__trackstates_gsf.root: 2104f95f9c07522aeeb5365c10873ed8aee16cf7cf2a660099da380a4208813a
test_truth_tracking_gsf[generic]__tracksummary_gsf.root: d3b7324979097de4cc37a91d0bd26986cbac397efda7a55abb13533e477d9cda
test_truth_tracking_gsf[odd]__trackstates_gsf.root: 7876ff70228b748f12b752a7170e306053556bcc659cabe6442dfe2d718da39a
test_truth_tracking_gsf[odd]__tracksummary_gsf.root: a343a639d5e406e96a0dcd0da9b4463310330f522a675cf69beb5c286692abee
test_truth_tracking_gsf[generic]__trackstates_gsf.root: d69377c836d1825864aeca41bc7b880ce86f38f3692bd186667a3a36377366cd
test_truth_tracking_gsf[generic]__tracksummary_gsf.root: d01a5841520fdbd2d2c8483468ffc730c8e1dc459eb2179eb91808e23e5039cf
test_truth_tracking_gsf[odd]__trackstates_gsf.root: 24259acbb2d31acfb88ee5704cf7174eb5cec312ab7e32d1f3102005e33581dd
test_truth_tracking_gsf[odd]__tracksummary_gsf.root: e89871a8f2607b7da7176e5f36cde861231d2e24885bdb4a7041d2f73f3517c9
test_particle_gun__particles.root: 8549ba6e20338004ab8ba299fc65e1ee5071985b46df8f77f887cb6fef56a8ec
test_material_mapping__material-map_tracks.root: 90a7deab073691ef431a3711e9cba40e902ce4de92a9b57162d84fbef5f97039
test_material_mapping__propagation-material.root: c60b17ddc4921847bb3e9ebf58de10322d0d3888596ee1106f160055647d8445
Expand Down
3 changes: 2 additions & 1 deletion Examples/Scripts/Python/truth_tracking_gsf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def runTruthTrackingGsf(
addParticleGun(
s,
EtaConfig(-2.0, 2.0),
ParticleConfig(4, acts.PdgParticle.eMuon, True),
ParticleConfig(4, acts.PdgParticle.eElectron, True),
PhiConfig(0.0, 360.0 * u.degree),
multiplicity=2,
rnd=rnd,
Expand All @@ -72,6 +72,7 @@ def runTruthTrackingGsf(
trackingGeometry,
field,
rnd=rnd,
enableInteractions=True,
)

addDigitization(
Expand Down
5 changes: 5 additions & 0 deletions Fatras/include/ActsFatras/Kernel/detail/SimulationActor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@ struct SimulationActor {
before.fourMomentum(), after.fourMomentum(), result.hits.size());
}

if (after.absoluteMomentum() == 0.0) {
result.isAlive = false;
return;
}

// continue the propagation with the modified parameters
stepper.update(state.stepping, after.position(), after.unitDirection(),
after.absoluteMomentum(), after.time());
Expand Down