diff --git a/Core/src/Material/Interactions.cpp b/Core/src/Material/Interactions.cpp index 133008c5f8f..464a9313a8a 100644 --- a/Core/src/Material/Interactions.cpp +++ b/Core/src/Material/Interactions.cpp @@ -256,7 +256,8 @@ namespace { /// -> sigma = fwhm / (2 * sqrt(2 * log(2))) /// inline float convertLandauFwhmToGaussianSigma(float fwhm) { - return fwhm / (2 * std::sqrt(2 * std::log(2.0f))); + // return fwhm / (2 * std::sqrt(2 * std::log(2.0f))); + return fwhm * 0.42466090014400953f; } } // namespace diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt index ebed2c9743c..7b31a700997 100644 --- a/Examples/Python/tests/root_file_hashes.txt +++ b/Examples/Python/tests/root_file_hashes.txt @@ -1,7 +1,7 @@ test_pythia8__pythia8_particles.root: d9a3d4f16c01aab9984e0e848292760d44015f210878866cc94f3bb9d030034b test_fatras__particles_final.root: 59b9f069c0133284070e5c8c313b52d84cd8fdeda49b57d64c8ae2af4fe3e087 test_fatras__particles_initial.root: 0e2d9974fdd4aa5549c5c05817ec54fe6c7d9cbe7969647f227956167e31110d -test_fatras__hits.root: 1af2137101abab14725c0dc4620cd3525fe9f5557bf96cd43dffa3bf7284c0df +test_fatras__hits.root: bda74a44bb9485e62f79d119637ce6c3f38f65491fbee9d43b1ed5bf0cae080c test_geant4__particles_final.root: abf91622e96c0723651e864e050c7fdeee84b230aacb1c261ad81ff4e5df5f2c test_geant4__particles_initial.root: 5be86aa4a2fc369093746451f37085e2c93f80f079b66023f5fe4b67e20100f6 test_geant4__hits.root: 70b592a546fd362c9341d87c9068b1f8fed657e0036e62e7262c01fa5eb2d469 @@ -22,49 +22,49 @@ test_itk_seeding__particles_final.root: c5cc218b5802fa0829feb2abb113b1eba7f6a428 test_itk_seeding__particles_initial.root: 88315e93ed4cb5d40a8721502048a9d1fc100e0a7d504e25fd4502c8302f1578 test_propagation__propagation_steps.root: 174301b25784dbb881196b658f2d7f99c0a2ea688a0129e6110fc19aa5cf8e54 test_material_recording__geant4_material_tracks.root: e411152d370775463c22b19a351dfc7bfe40b51985e10a7c1a010aebde80715d -test_truth_tracking_kalman[generic-0.0]__trackstates_fitter.root: b1ef742316c5da85c7e8b1aec6b665c2b3a02f9cdabb97764c3a80227ce9c726 -test_truth_tracking_kalman[generic-0.0]__tracksummary_fitter.root: e41639378960b2ecbcc31ad432e29eb56b6d900e642fdc53879d0708f8ab9155 +test_truth_tracking_kalman[generic-0.0]__trackstates_fitter.root: 124f7218af16279563e58bb2652c74adcacf937e6410c1626abfd769caf18c08 +test_truth_tracking_kalman[generic-0.0]__tracksummary_fitter.root: 2994fa07ac45f2538fc45cbc54012f745e6352b080ba5f81aace6700900ccfd6 test_truth_tracking_kalman[generic-0.0]__performance_track_finder.root: 7fc6f717723c9eddcbf44820b384b373cee6f04b72f79902f938f35e3ff9b470 -test_truth_tracking_kalman[generic-1000.0]__trackstates_fitter.root: d9783de6fdf1c3555bf3e9b1f872f40f440771f476bd918282af7e144753f890 -test_truth_tracking_kalman[generic-1000.0]__tracksummary_fitter.root: fd522a5636614a4b987802bbb8c9ff9b5eb0d9b0e876a3066e66354eaa297398 +test_truth_tracking_kalman[generic-1000.0]__trackstates_fitter.root: 180c58d4175815cdd3b1d4caa47cabfa03cba85d0279c10811a075795f57cdfd +test_truth_tracking_kalman[generic-1000.0]__tracksummary_fitter.root: c19be278dbb7b79190142233d36887d5f772c8eeae298dc240209c1cf659bbb5 test_truth_tracking_kalman[generic-1000.0]__performance_track_finder.root: 7fc6f717723c9eddcbf44820b384b373cee6f04b72f79902f938f35e3ff9b470 -test_truth_tracking_kalman[odd-0.0]__trackstates_fitter.root: c270b3a8d98c53924b5893067f1302aff8fb48e4e34fa190c58552aeafe222b9 -test_truth_tracking_kalman[odd-0.0]__tracksummary_fitter.root: d33319894494feb8c0d6f0f90a1d1e59caf9de32eda480ab73d0e40dfcdd1322 +test_truth_tracking_kalman[odd-0.0]__trackstates_fitter.root: df4d8a275723e810efc83f04695b045b0588936b15a676292bf7654afeb8761e +test_truth_tracking_kalman[odd-0.0]__tracksummary_fitter.root: 0a4b78e66db6bc8f46cd4b2743fda4815bbeebb00cb5ee034d11a23afea8ed09 test_truth_tracking_kalman[odd-0.0]__performance_track_finder.root: 39aec6316cceb90e314e16b02947faa691c18f57c3a851a25e547a8fc05a4593 -test_truth_tracking_kalman[odd-1000.0]__trackstates_fitter.root: 825a902f1ada8be69d33d0a1e798fc77717eb08dfeb38b3593eb46535f25eba0 -test_truth_tracking_kalman[odd-1000.0]__tracksummary_fitter.root: 99fe9c3be034549816c73f7f3d2190df7efb0adf6aed16cceb86aa4a9ac271f0 +test_truth_tracking_kalman[odd-1000.0]__trackstates_fitter.root: 1cee682651a286cc88faa80298044283fb55809d09c878397904fa8c60c92be2 +test_truth_tracking_kalman[odd-1000.0]__tracksummary_fitter.root: efb1bc7cf25f1be1088cb2cee84fc86d059234257d5489092fbd4180b499c629 test_truth_tracking_kalman[odd-1000.0]__performance_track_finder.root: 39aec6316cceb90e314e16b02947faa691c18f57c3a851a25e547a8fc05a4593 -test_truth_tracking_gsf[generic]__trackstates_gsf.root: 2ad1eb1d77c266a089027721c6327f88b53732abbf141bf9c066fa9a75e26b1e -test_truth_tracking_gsf[generic]__tracksummary_gsf.root: abfa600668eda81fa0542df2d9ced6d550d744f1f8f3f4c789d137f7748363e2 -test_truth_tracking_gsf[odd]__trackstates_gsf.root: a536e746e9c2de1f9c959c65b697f97aa6da606e3de1464c02972368d13c343a -test_truth_tracking_gsf[odd]__tracksummary_gsf.root: 690b72c9ed7a6779d6233b8b68d05e9b860165efd258ad80581485a4e01d9996 +test_truth_tracking_gsf[generic]__trackstates_gsf.root: 16eb3fdab606a68035494c68d8ceb292bd33d2b99849933cf5e9fbf121bb52e9 +test_truth_tracking_gsf[generic]__tracksummary_gsf.root: de90d31feff1187ce601cdcf7222b6a4569aae78acadecde51464e0c1e4a7c04 +test_truth_tracking_gsf[odd]__trackstates_gsf.root: bab920fd067ec295ed21063d56e06dd68cbaa6a2478f96ceae03a6741abc3960 +test_truth_tracking_gsf[odd]__tracksummary_gsf.root: c6cffc3159ee32915f42ba81399db0aa71a7cb7764220ec5a8539159229ab15f test_particle_gun__particles.root: 8549ba6e20338004ab8ba299fc65e1ee5071985b46df8f77f887cb6fef56a8ec test_material_mapping__material-map_tracks.root: 4e1c866038f0c06b099aa74fd01c3d875f07b89f54898f90debd9b558d8e4025 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: feab449de79873f624280b031cc9f2b75b55f50e4a405d8d2a0567090455c303 -test_digitization_example[geometric]__measurements.root: 07b1593e5404b237f473e76c8fe2631dcb6ba5225eb213ea62bc9458aba805e5 +test_digitization_example[smeared]__measurements.root: dcd0ab75b60c6458d25d7211c490a8abe907b53fa4128abe800d93a786a87c10 +test_digitization_example[geometric]__measurements.root: 38017cff7b7e2a0f5d90a23bd99fa289f717380305705545edbfe39757074136 test_digitization_example_input[smeared]__particles.root: 8549ba6e20338004ab8ba299fc65e1ee5071985b46df8f77f887cb6fef56a8ec -test_digitization_example_input[smeared]__measurements.root: 0f42102396b84a7c56338dda4333851a7c70c0cc6f5ee9822cb7760dd829e91f +test_digitization_example_input[smeared]__measurements.root: cca36dd6cbbbff48cc8516ed1e8373514bff56ec7594a613c8096b12a5dfd02a test_digitization_example_input[geometric]__particles.root: 8549ba6e20338004ab8ba299fc65e1ee5071985b46df8f77f887cb6fef56a8ec -test_digitization_example_input[geometric]__measurements.root: 567cb403baaf71e75029d42fae8d10c412cf05536a30d69a8b45de40074fa386 -test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: ed801201e4cd1a878c4882ee1861d06c14fed48056dfbbf09048f3645b78cffe -test_ckf_tracks_example[generic-full_seeding]__tracksummary_ckf.root: 048e0fdbc420ea7e06d9a92543eaa35d39cc6ed7aafde1ad6160da299fc60a50 +test_digitization_example_input[geometric]__measurements.root: a92965e6694005463914a2da8f585b292110c4303a6de06af88aba10f0668836 +test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: 11108a841554c8941328b8709e2f71b325d8378797c8cc864a6ae20d8bb7419d +test_ckf_tracks_example[generic-full_seeding]__tracksummary_ckf.root: 725261f0590a5c910b75857a2cd1bca6fbe6e4cb141133a89697d876e18c7665 test_ckf_tracks_example[generic-full_seeding]__performance_seeding_trees.root: 0e0676ffafdb27112fbda50d1cf627859fa745760f98073261dcf6db3f2f991e -test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: 657695c812bcc2950fcd0ee4ee0117a3b102743c9dd2c6bb7d8a290348656352 -test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: 8f0bd648fb5e35b7a37fb00b7f7534381a06290adc1ccfc1be3d7ed67eecb2fe +test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: 617fce53c5ebf6dabf137cd821d21b7f6bce177ff7cd0c3b7a2219ac00041e66 +test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: 3deda36a3c3ab662e7743338c17105764eb38f08bba4f4698549ecf14ac1c371 test_ckf_tracks_example[generic-truth_estimated]__performance_seeding.root: 1facb05c066221f6361b61f015cdf0918e94d9f3fce2269ec7b6a4dffeb2bc7e -test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: ba9dc9c035ea5cf30233e2456b22c0dc65c4ae903ee281007d320af299cb1e62 -test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: 47ca8f012d1d5578699372747469719daa185d7a5684500be093f6591b8abb25 -test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: b515e93e1efc7504c40255bbd2c321daa325789c9f88488d8f40d905a1a6a518 -test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: d178b6d22f4789f29d360b0ec838045992c1367b8c93b5ce1980f88096684bca +test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: d3f04c8811c2d2eddd4c2f1b1183af7b9dec0dcf01b202c448d97a664bb27961 +test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: 638c753a0454d3ba09b5e14c053627c9b4004a6a1796479c9638a7648235c017 +test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: ec3f86b7304d5639a9b8d243b92403840488c0caa1fc6f7d6acc3db0840e65e1 +test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: 87ae00e9ae8729f1d346c5e3d8cf259e9807432b089a2e108e614996f0b1f9c8 test_ckf_tracks_example[odd-full_seeding]__performance_seeding_trees.root: 43c58577aafe07645e5660c4f43904efadf91d8cda45c5c04c248bbe0f59814f -test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: ae011b71bddec56e14a548ef0bbd6d3b052f28f8d120ce1277021252e2a14e6a -test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: e6c9892799b21a24549c343be0c0bcf208f28f7d17724f0bf457757a1df866ff +test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: c13234aff8faac883a137fa97f0df84234ba77467591d0753e411e9c12043260 +test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: d4450b95176bbc2fa341fe848f0ae2b343c97a597e1ef35bd9fa3c6b342150c1 test_ckf_tracks_example[odd-truth_estimated]__performance_seeding.root: 1a36b7017e59f1c08602ef3c2cb0483c51df248f112e3780c66594110719c575 -test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 585c96c5fa8dee01192ef73eee25c40f17e93cf9d5fc9edce0ea905d2c44af44 -test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: ce4d79a569b2c55aa3d26c9216e358db544e4edccd4c8c70304211bcb7649101 +test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 6993ec63abadf148aa1a094080eecc40fea95810bc433d4cef1c50894743abef +test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: 460189a1c944fd2f473cc7d834bb2aa7e66774495ef4abac385802cdca89b659 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