fix: Improve full chain pulls by enabling Fatras interactions (#2086)

Our full chain pulls are in a bad state. Looks like the reconstruction and simulation energy loss did not match up. This PR switches the Fatras interactions on which should bring our pulls back to standard normal distribution. Fixes - #1643 Blocked by - #2157 - #2239 - #2295 - #2293 - #2294
acts-project · Jul 24, 2023 · dbcba62 · dbcba62
1 parent 22fa536
commit dbcba62
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 32 deletions.
diff --git a/CI/physmon/reference/performance_ambi_orthogonal.root b/CI/physmon/reference/performance_ambi_orthogonal.root
diff --git a/CI/physmon/reference/performance_ambi_seeded.root b/CI/physmon/reference/performance_ambi_seeded.root
diff --git a/CI/physmon/reference/performance_amvf_orthogonal_hist.root b/CI/physmon/reference/performance_amvf_orthogonal_hist.root
diff --git a/CI/physmon/reference/performance_amvf_seeded_hist.root b/CI/physmon/reference/performance_amvf_seeded_hist.root
diff --git a/CI/physmon/reference/performance_amvf_truth_estimated_hist.root b/CI/physmon/reference/performance_amvf_truth_estimated_hist.root
diff --git a/CI/physmon/reference/performance_amvf_truth_smeared_hist.root b/CI/physmon/reference/performance_amvf_truth_smeared_hist.root
diff --git a/CI/physmon/reference/performance_ckf_orthogonal.root b/CI/physmon/reference/performance_ckf_orthogonal.root
diff --git a/CI/physmon/reference/performance_ckf_seeded.root b/CI/physmon/reference/performance_ckf_seeded.root
diff --git a/CI/physmon/reference/performance_ckf_truth_estimated.root b/CI/physmon/reference/performance_ckf_truth_estimated.root
diff --git a/CI/physmon/reference/performance_ckf_truth_smeared.root b/CI/physmon/reference/performance_ckf_truth_smeared.root
diff --git a/CI/physmon/reference/performance_ivf_orthogonal_hist.root b/CI/physmon/reference/performance_ivf_orthogonal_hist.root
diff --git a/CI/physmon/reference/performance_ivf_seeded_hist.root b/CI/physmon/reference/performance_ivf_seeded_hist.root
diff --git a/CI/physmon/reference/performance_ivf_truth_estimated_hist.root b/CI/physmon/reference/performance_ivf_truth_estimated_hist.root
diff --git a/CI/physmon/reference/performance_ivf_truth_smeared_hist.root b/CI/physmon/reference/performance_ivf_truth_smeared_hist.root
diff --git a/CI/physmon/reference/tracksummary_ckf_orthogonal_hist.root b/CI/physmon/reference/tracksummary_ckf_orthogonal_hist.root
diff --git a/CI/physmon/reference/tracksummary_ckf_seeded_hist.root b/CI/physmon/reference/tracksummary_ckf_seeded_hist.root
diff --git a/CI/physmon/reference/tracksummary_ckf_truth_estimated_hist.root b/CI/physmon/reference/tracksummary_ckf_truth_estimated_hist.root
diff --git a/CI/physmon/reference/tracksummary_ckf_truth_smeared_hist.root b/CI/physmon/reference/tracksummary_ckf_truth_smeared_hist.root
diff --git a/CI/physmon/workflows/physmon_ckf_tracking.py b/CI/physmon/workflows/physmon_ckf_tracking.py
@@ -75,6 +75,7 @@ def run_ckf_tracking(truthSmearedSeeded, truthEstimatedSeeded, label):
             s,
             setup.trackingGeometry,
             setup.field,
+            enableInteractions=True,
             rnd=rnd,
         )
 

diff --git a/CI/physmon/workflows/physmon_vertexing.py b/CI/physmon/workflows/physmon_vertexing.py
@@ -73,6 +73,7 @@ def run_vertexing(fitter, mu, events):
             s,
             setup.trackingGeometry,
             setup.field,
+            enableInteractions=True,
             rnd=rnd,
         )
 

diff --git a/Examples/Python/python/acts/examples/simulation.py b/Examples/Python/python/acts/examples/simulation.py
@@ -388,7 +388,7 @@ def addFatras(
     rnd: acts.examples.RandomNumbers,
     preSelectParticles: Optional[ParticleSelectorConfig] = ParticleSelectorConfig(),
     postSelectParticles: Optional[ParticleSelectorConfig] = None,
-    enableInteractions: bool = False,
+    enableInteractions: bool = True,
     pMin: Optional[float] = None,
     inputParticles: str = "particles_input",
     outputParticlesInitial: str = "particles_initial",

diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt
@@ -1,24 +1,24 @@
 test_pythia8__pythia8_particles.root: d9a3d4f16c01aab9984e0e848292760d44015f210878866cc94f3bb9d030034b
-test_fatras__particles_final.root: 0bfe4bbac90b112fd960b39cd5edd7d19fb9b8e308f8315db0871bfae061b550
+test_fatras__particles_final.root: 59b9f069c0133284070e5c8c313b52d84cd8fdeda49b57d64c8ae2af4fe3e087
 test_fatras__particles_initial.root: 0e2d9974fdd4aa5549c5c05817ec54fe6c7d9cbe7969647f227956167e31110d
-test_fatras__hits.root: d46b760e1647ab94c49d6976a78ee5a6178d41c45f2238f86f3987938a7901fb
+test_fatras__hits.root: 1af2137101abab14725c0dc4620cd3525fe9f5557bf96cd43dffa3bf7284c0df
 test_geant4__particles_final.root: abf91622e96c0723651e864e050c7fdeee84b230aacb1c261ad81ff4e5df5f2c
 test_geant4__particles_initial.root: 5be86aa4a2fc369093746451f37085e2c93f80f079b66023f5fe4b67e20100f6
 test_geant4__hits.root: 70b592a546fd362c9341d87c9068b1f8fed657e0036e62e7262c01fa5eb2d469
-test_seeding__estimatedparams.root: d39de91d7b0a88f0261070f33da5c5db96e2872f118b42a06577b38f5e81b25c
+test_seeding__estimatedparams.root: 4f8e382817f0634c40293dabc21eefa746fb90eb74f11abe66a2048f5ccfdf2c
 test_seeding__performance_seeding.root: 992f9c611d30dde0d3f3ab676bab19ada61ab6a4442828e27b65ec5e5b7a2880
 test_seeding__particles.root: 74e08ee12bdaf9f7d273369c71c742df345475c8b73bb7ce223619d0dd1f87ee
-test_seeding__particles_final.root: a011dda7edbdc8b8a0e275f5940d46b8e0fab99e10b7df152be380bddfc25192
+test_seeding__particles_final.root: 13da6831bb08b063a1b417b4f9592e080ad3399ce508fa8876a7c3d1014b3534
 test_seeding__particles_initial.root: 74e08ee12bdaf9f7d273369c71c742df345475c8b73bb7ce223619d0dd1f87ee
-test_seeding_orthogonal__estimatedparams.root: 9f101486a251ae792e39779781d3d4f733fd8b95b1f84266cf938a45af3e9263
+test_seeding_orthogonal__estimatedparams.root: da9fc81907de1ca0ef5cbe06ecfbd30cb014513fd28e1b2a8e68fc0856492ac4
 test_seeding_orthogonal__performance_seeding.root: 60fbedcf5cb2b37cd8e526251940564432890d3a159d231ed819e915a904682c
 test_seeding_orthogonal__particles.root: 74e08ee12bdaf9f7d273369c71c742df345475c8b73bb7ce223619d0dd1f87ee
-test_seeding_orthogonal__particles_final.root: a011dda7edbdc8b8a0e275f5940d46b8e0fab99e10b7df152be380bddfc25192
+test_seeding_orthogonal__particles_final.root: 13da6831bb08b063a1b417b4f9592e080ad3399ce508fa8876a7c3d1014b3534
 test_seeding_orthogonal__particles_initial.root: 74e08ee12bdaf9f7d273369c71c742df345475c8b73bb7ce223619d0dd1f87ee
-test_itk_seeding__estimatedparams.root: 812c4380037646c78dc0d2153478050e5ddbdce67924451e89cf5f78dbf35d0e
+test_itk_seeding__estimatedparams.root: b42e2795c9529735b8b8fdf960b6ed7257c307e0690033b00942377ee6ba4421
 test_itk_seeding__performance_seeding.root: 78ebda54cd0f026ba4b7f316724ffd946de56a932735914baf1b7bba9505c29d
 test_itk_seeding__particles.root: 88315e93ed4cb5d40a8721502048a9d1fc100e0a7d504e25fd4502c8302f1578
-test_itk_seeding__particles_final.root: e7699af6835ca90f730ad5186989c611d782e8b96c9fccc27a47433490663102
+test_itk_seeding__particles_final.root: c5cc218b5802fa0829feb2abb113b1eba7f6a4284230fdd9f7c39701da6efd17
 test_itk_seeding__particles_initial.root: 88315e93ed4cb5d40a8721502048a9d1fc100e0a7d504e25fd4502c8302f1578
 test_propagation__propagation_steps.root: 174301b25784dbb881196b658f2d7f99c0a2ea688a0129e6110fc19aa5cf8e54
 test_material_recording__geant4_material_tracks.root: e411152d370775463c22b19a351dfc7bfe40b51985e10a7c1a010aebde80715d
@@ -43,28 +43,28 @@ test_material_mapping__material-map_tracks.root: 4e1c866038f0c06b099aa74fd01c3d8
 test_material_mapping__propagation-material.root: 646b8e2bbacec40d0bc4132236f9ab3f03b088e656e6e9b80c47ae03eaf6eab5
 test_volume_material_mapping__material-map-volume_tracks.root: b95561a6247df9e3599a997daa6c1d76461e58f83059b82f2ec27229c9b35e6c
 test_volume_material_mapping__propagation-volume-material.root: b7597dada372d1b4aaec2c4fc3c0db830ce147ecf515c367ac6ba8ffc2708302
-test_digitization_example[smeared]__measurements.root: 96c75125b172d206f3e8c0458ace8f7e7687a5ed651dc00200d08682b5275e9d
-test_digitization_example[geometric]__measurements.root: c072456e48826041f758da7f2d40712f60e3181cc35cef5b815229ad80cf5907
+test_digitization_example[smeared]__measurements.root: feab449de79873f624280b031cc9f2b75b55f50e4a405d8d2a0567090455c303
+test_digitization_example[geometric]__measurements.root: 07b1593e5404b237f473e76c8fe2631dcb6ba5225eb213ea62bc9458aba805e5
 test_digitization_example_input[smeared]__particles.root: 8549ba6e20338004ab8ba299fc65e1ee5071985b46df8f77f887cb6fef56a8ec
-test_digitization_example_input[smeared]__measurements.root: 97d695ea55114aa3cb6c967c43e820472ceb8129afbb4f1f22bf1b3eca55ced9
+test_digitization_example_input[smeared]__measurements.root: 0f42102396b84a7c56338dda4333851a7c70c0cc6f5ee9822cb7760dd829e91f
 test_digitization_example_input[geometric]__particles.root: 8549ba6e20338004ab8ba299fc65e1ee5071985b46df8f77f887cb6fef56a8ec
-test_digitization_example_input[geometric]__measurements.root: 9e7ab4e553966728306c0aa70496b95e440165d40ea89483fc5f7295988debe6
-test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: d9655d2cf878cbb119106435a59bb5ed4e23d3782e11aec03ae49929addd51ef
-test_ckf_tracks_example[generic-full_seeding]__tracksummary_ckf.root: 9f8ca65cb8aafc84ae1efeff8287a1a3f16ad3dba0bfc68f596f6d9e3034e1cf
+test_digitization_example_input[geometric]__measurements.root: 567cb403baaf71e75029d42fae8d10c412cf05536a30d69a8b45de40074fa386
+test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: d86c03a97613d6cd0646b25b5fd58a1dccaba704d9af2d88acb651dd54c68106
+test_ckf_tracks_example[generic-full_seeding]__tracksummary_ckf.root: b71bdb12af27c1e94c139ee3264823f048e92d23fe34039797ef78679bf89d9d
 test_ckf_tracks_example[generic-full_seeding]__performance_seeding_trees.root: 0e0676ffafdb27112fbda50d1cf627859fa745760f98073261dcf6db3f2f991e
-test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: 94d11c85fe60c76486d3d57d9c202853414e2347c53d970ba2eae0bf0622ccd9
-test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: 9fac39cb5a29c8320624c8c3b80c0bc915277adf5c0e2dce41aca9b7a0b44fbb
+test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: a69c698efe1d6a25c934f6ee2a6ce66a46846321c3c321f39830db3999d6117a
+test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: ea69b54988175d4ebb2bef25a273b06520a780c98f38d405e655de9b65bbae7f
 test_ckf_tracks_example[generic-truth_estimated]__performance_seeding.root: 1facb05c066221f6361b61f015cdf0918e94d9f3fce2269ec7b6a4dffeb2bc7e
-test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: 62057fca054ed932488f30369946916c2b072c91601c5400db8b3830b3994a8d
-test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: c898a056570ad59fa96c80244f12321285d1ed0a1cf59cdec00e9c8e8aff23c6
-test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: ee13473601d07e593961e1886e9be861222da4e75b255206d08c5c02af719651
-test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: ee222601149ea6548c981e265988adfbaea8f4186b329fd22f45953baa197c9b
+test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: 3fa8cc03f5840fb75fb53f3b1ee39021036b22d46f97c41f599269fae4e459b5
+test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: fa1dd16d2acb9561f5405c7e7eb270a3508c5ef231a27f01a9aba1d8dd832f87
+test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: af06990ef8be779d00d0e6ba2496af5c97a3e0487d47e017fdae261066473590
+test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: 2cce165675400e2a830f2c8c03f844ff6f00e3ea17c6278677a3d707a553f46c
 test_ckf_tracks_example[odd-full_seeding]__performance_seeding_trees.root: 43c58577aafe07645e5660c4f43904efadf91d8cda45c5c04c248bbe0f59814f
-test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: 99b2fa5c4ad1ada3d6359700af26d50aeb329974b4dae921a2f26426cbf0f4e9
-test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: d956af4553ef75c6a538085c5d1e3bfa01654778f01b7ab3639011357449b310
+test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: 20eabea9f47a9fbee54b1251123ee1610195a07140feedb6825bb935a9ea9acf
+test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: 3e86a6fc0d598e7869f746f1a3104bc06372f4ce4f2b25eb84e44020394aebce
 test_ckf_tracks_example[odd-truth_estimated]__performance_seeding.root: 1a36b7017e59f1c08602ef3c2cb0483c51df248f112e3780c66594110719c575
-test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: c5103afef6ab1f44b3654332d350f9c75dba519e431a125f1534d4e27df1f7d2
-test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: 23bbc9701710012b8330a34e25cd33fa8ae985dfe2efd3a6bb1038f7cdb48894
+test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: da5fc4d1d273c249b21b2653e7e66e084159af47919f095778b6959565d1e50a
+test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: a36d469f019ec3bd093d940a57837ca1acf069f31c226f620b889ffa04c8ac56
 test_vertex_fitting_reading[Truth-False-100]__performance_vertexing.root: 76ef6084d758dfdfc0151ddec2170e12d73394424e3dac4ffe46f0f339ec8293
 test_vertex_fitting_reading[Iterative-False-100]__performance_vertexing.root: 60372210c830a04f95ceb78c6c68a9b0de217746ff59e8e73053750c837b57eb
 test_vertex_fitting_reading[Iterative-True-100]__performance_vertexing.root: e34f217d524a5051dbb04a811d3407df3ebe2cc4bb7f54f6bda0847dbd7b52c3
@@ -86,7 +86,7 @@ test_root_material_writer__material.root: e3b0c44298fc1c149afbf4c8996fb92427ae41
 test_root_clusters_writer[configPosConstructor]__clusters.root: 97f04fdd2c0eef4d37dc8732dd25ab49a90bb51925b2638d94826becf5059fae
 test_root_clusters_writer[configKwConstructor]__clusters.root: 97f04fdd2c0eef4d37dc8732dd25ab49a90bb51925b2638d94826becf5059fae
 test_root_clusters_writer[kwargsConstructor]__clusters.root: 97f04fdd2c0eef4d37dc8732dd25ab49a90bb51925b2638d94826becf5059fae
-test_exatrkx[gpu-onnx]__performance_track_finding.root: 82ac44103ec1a35770715506ae988fd937c4c6631bbea4badebf9759c505392d
-test_exatrkx[cpu-torch]__performance_track_finding.root: 1097071ed0540d59c5a30aa60176a0d02e402d82b164944f26c33cfd9039f593
-test_exatrkx[gpu-torch]__performance_track_finding.root: ccbabd3dc4973f93504b1c8bd15355ff5f6ac59cd5fe5a358ba90272afc34687
+test_exatrkx[cpu-torch]__performance_track_finding.root: 926d5056c290f1f35d0564e3781c5a1953f35c7f03095ce6420e8814b6e0ab84
+test_exatrkx[gpu-onnx]__performance_track_finding.root: c232d638e53f0f5394d94e8343d1c4f34cf551aaab13db3f8ade4b1fb48b26dd
+test_exatrkx[gpu-torch]__performance_track_finding.root: 25c8169fe0a0f12aced3dcd729d15a666c9795514cfc62d68a5567af0bc2a262
 test_ML_Ambiguity_Solver__performance_ambiML.root: 080e183e758b8593a9c233e2d1b4d213f28fdcb18d82acefdac7c9a5a5763bfc
diff --git a/Examples/Python/tests/test_examples.py b/Examples/Python/tests/test_examples.py
@@ -1036,10 +1036,10 @@ def test_digitization_example_input(
             "vol12_lay12_mod141", "vol12_lay12_mod167", "vol13", "vol13_lay2",
             "vol14_lay2_mod93", "vol14_lay2_mod102", "vol14_lay2_mod112",
             "vol14_lay2_mod118", "vol14_lay4_mod112", "vol14_lay4_mod118",
-            "vol14_lay4_mod152", "vol14_lay4_mod161", "vol14_lay6_mod152",
-            "vol16_lay4", "vol16_lay6", "vol16_lay8", "vol16_lay10", "vol16_lay12",
-            "vol17", "vol17_lay2", "vol18_lay2", "vol18_lay2_mod71", "vol18_lay4",
-            "vol18_lay6", "vol18_lay8", "vol18_lay10"
+            "vol14_lay4_mod152", "vol14_lay4_mod161", "vol16_lay4", "vol16_lay6",
+            "vol16_lay8", "vol16_lay10", "vol16_lay12", "vol17", "vol17_lay2",
+            "vol18_lay2", "vol18_lay2_mod71", "vol18_lay4", "vol18_lay6",
+            "vol18_lay8", "vol18_lay10"
         ]
         # fmt: on
 

diff --git a/Examples/Scripts/Python/full_chain_odd.py b/Examples/Scripts/Python/full_chain_odd.py
@@ -137,6 +137,7 @@
         )
         if ttbar
         else ParticleSelectorConfig(),
+        enableInteractions=True,
         outputDirRoot=outputDir,
         # outputDirCsv=outputDir,
         rnd=rnd,