diff --git a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_finding_ckf.root index 305a3bf724fa..b2e59570e851 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_finding_ckf.root and b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_finding_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_fitting_ckf.root index 241d03ae1ff2..36c779d4846d 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_fitting_ckf.root and b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_fitting_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_seeding.root b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_seeding.root index d55d3833570c..1049ad5b18bb 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_seeding.root and b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_seeding.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_1muon/seeded/performance_finding_ckf.root index a9a127efa07d..7f59b99cf7e5 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/seeded/performance_finding_ckf.root and b/CI/physmon/reference/trackfinding_1muon/seeded/performance_finding_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_1muon/seeded/performance_fitting_ckf.root index 7ffe7fd50adf..5ba97ecd1687 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/seeded/performance_fitting_ckf.root and b/CI/physmon/reference/trackfinding_1muon/seeded/performance_fitting_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/performance_seeding.root b/CI/physmon/reference/trackfinding_1muon/seeded/performance_seeding.root index 0c64e9fe6312..d91320f3d9a7 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/seeded/performance_seeding.root and b/CI/physmon/reference/trackfinding_1muon/seeded/performance_seeding.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_finding_ckf.root index 8b9f8ae4d1d9..b4def41bfb5c 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_finding_ckf.root and b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_finding_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_fitting_ckf.root index 8421b7d1937b..3fcdb6021d1a 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_fitting_ckf.root and b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_fitting_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_seeding.root b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_seeding.root index 06abee42be7c..4d134bc87d3b 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_seeding.root and b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_seeding.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_finding_ckf.root index e38e388edce6..10f10907b8d7 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_finding_ckf.root and b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_finding_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_fitting_ckf.root index 7a90899ebb5b..1ca5e629d357 100644 Binary files a/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_fitting_ckf.root and b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_fitting_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf.root index c4507b9636aa..71bfd26dfb8a 100644 Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf_ambi.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf_ambi.root index 35b860dcb8e2..39d7dc1a31fc 100644 Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf_ambi.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf_ambi.root differ diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf.root index 9376d4ee756a..b90f40313eb4 100644 Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf_ambi.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf_ambi.root index a80a41319570..ff59dc310eb7 100644 Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf_ambi.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf_ambi.root differ diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_seeding.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_seeding.root index 0a59b0fba855..e79e159caa24 100644 Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_seeding.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_seeding.root differ diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root index 780bcb524246..d4b5a8b9dde6 100644 Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root index e3c280303bf1..a083efffaff0 100644 Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root differ diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root index be682507eb24..09d2dc033af5 100644 Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root differ diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ambi.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ambi.root index 54f97bf9abc3..949d8cebfc35 100644 Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ambi.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ambi.root differ diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root index 59b65288d0a6..500783b48a42 100644 Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root differ diff --git a/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root b/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root index e88989022ada..b3543963d9fa 100644 Binary files a/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root and b/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root differ diff --git a/CI/physmon/reference/trackfitting_gx2f/performance_trackfitting.root b/CI/physmon/reference/trackfitting_gx2f/performance_trackfitting.root index 8fae64cd735d..21533ce80762 100644 Binary files a/CI/physmon/reference/trackfitting_gx2f/performance_trackfitting.root and b/CI/physmon/reference/trackfitting_gx2f/performance_trackfitting.root differ diff --git a/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root b/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root index 2fe268e872a9..4e3f44e2b341 100644 Binary files a/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root and b/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root differ diff --git a/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root b/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root index 300b14d54aaf..b6b8d6fd1262 100644 Binary files a/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root and b/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root differ diff --git a/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root b/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root index 860b6da66ff9..99385589d483 100644 Binary files a/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root and b/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root differ diff --git a/Examples/Framework/include/ActsExamples/Validation/EffPlotTool.hpp b/Examples/Framework/include/ActsExamples/Validation/EffPlotTool.hpp index 534549fbaa4b..7ac49098a0af 100644 --- a/Examples/Framework/include/ActsExamples/Validation/EffPlotTool.hpp +++ b/Examples/Framework/include/ActsExamples/Validation/EffPlotTool.hpp @@ -34,6 +34,7 @@ class EffPlotTool { {"Eta", PlotHelpers::Binning("#eta", 40, -4, 4)}, {"Phi", PlotHelpers::Binning("#phi", 100, -3.15, 3.15)}, {"Pt", PlotHelpers::Binning("pT [GeV/c]", 40, 0, 100)}, + {"Z0", PlotHelpers::Binning("z_0 [mm]", 50, -200, 200)}, {"DeltaR", PlotHelpers::Binning("#Delta R", 100, 0, 0.3)}}; }; @@ -42,6 +43,7 @@ class EffPlotTool { TEfficiency* trackEff_vs_pT{nullptr}; ///< Tracking efficiency vs pT TEfficiency* trackEff_vs_eta{nullptr}; ///< Tracking efficiency vs eta TEfficiency* trackEff_vs_phi{nullptr}; ///< Tracking efficiency vs phi + TEfficiency* trackEff_vs_z0{nullptr}; ///< Tracking efficiency vs z0 TEfficiency* trackEff_vs_DeltaR{ nullptr}; ///< Tracking efficiency vs distance to the closest truth ///< particle diff --git a/Examples/Framework/src/Validation/EffPlotTool.cpp b/Examples/Framework/src/Validation/EffPlotTool.cpp index a30c14997964..eb92cfa7b63d 100644 --- a/Examples/Framework/src/Validation/EffPlotTool.cpp +++ b/Examples/Framework/src/Validation/EffPlotTool.cpp @@ -27,6 +27,7 @@ void ActsExamples::EffPlotTool::book( PlotHelpers::Binning bEta = m_cfg.varBinning.at("Eta"); PlotHelpers::Binning bPt = m_cfg.varBinning.at("Pt"); PlotHelpers::Binning bDeltaR = m_cfg.varBinning.at("DeltaR"); + PlotHelpers::Binning bZ0 = m_cfg.varBinning.at("Z0"); ACTS_DEBUG("Initialize the histograms for efficiency plots"); // efficiency vs pT effPlotCache.trackEff_vs_pT = PlotHelpers::bookEff( @@ -37,6 +38,9 @@ void ActsExamples::EffPlotTool::book( // efficiency vs phi effPlotCache.trackEff_vs_phi = PlotHelpers::bookEff( "trackeff_vs_phi", "Tracking efficiency;Truth #phi;Efficiency", bPhi); + // efficiency vs z0 + effPlotCache.trackEff_vs_z0 = PlotHelpers::bookEff( + "trackeff_vs_z0", "Tracking efficiency;Truth z_0 [mm];Efficiency", bZ0); // efficiancy vs distance to the closest truth particle effPlotCache.trackEff_vs_DeltaR = PlotHelpers::bookEff( "trackeff_vs_DeltaR", @@ -47,6 +51,7 @@ void ActsExamples::EffPlotTool::clear(EffPlotCache& effPlotCache) const { delete effPlotCache.trackEff_vs_pT; delete effPlotCache.trackEff_vs_eta; delete effPlotCache.trackEff_vs_phi; + delete effPlotCache.trackEff_vs_z0; delete effPlotCache.trackEff_vs_DeltaR; } @@ -56,6 +61,7 @@ void ActsExamples::EffPlotTool::write( effPlotCache.trackEff_vs_pT->Write(); effPlotCache.trackEff_vs_eta->Write(); effPlotCache.trackEff_vs_phi->Write(); + effPlotCache.trackEff_vs_z0->Write(); effPlotCache.trackEff_vs_DeltaR->Write(); } @@ -65,10 +71,12 @@ void ActsExamples::EffPlotTool::fill(EffPlotTool::EffPlotCache& effPlotCache, const auto t_phi = phi(truthParticle.direction()); const auto t_eta = eta(truthParticle.direction()); const auto t_pT = truthParticle.transverseMomentum(); + const auto t_z0 = truthParticle.position().z(); const auto t_deltaR = deltaR; PlotHelpers::fillEff(effPlotCache.trackEff_vs_pT, t_pT, status); PlotHelpers::fillEff(effPlotCache.trackEff_vs_eta, t_eta, status); PlotHelpers::fillEff(effPlotCache.trackEff_vs_phi, t_phi, status); + PlotHelpers::fillEff(effPlotCache.trackEff_vs_z0, t_z0, status); PlotHelpers::fillEff(effPlotCache.trackEff_vs_DeltaR, t_deltaR, status); } diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt index 035781c3d0a0..3ade64a68eda 100644 --- a/Examples/Python/tests/root_file_hashes.txt +++ b/Examples/Python/tests/root_file_hashes.txt @@ -73,7 +73,7 @@ test_root_clusters_writer[kwargsConstructor]__clusters.root: e842df4fe04eefff3df test_exatrkx[cpu-torch]__performance_track_finding.root: 36b3045589c4c17c038dbc87943366f4af4440f7eea6887afb763871ac149b05 test_exatrkx[gpu-onnx]__performance_track_finding.root: 9090de10ffb1489d3f1993e2a3081a3038227e3e5c453e98a9a4f33ea3d6d817 test_exatrkx[gpu-torch]__performance_track_finding.root: 36b3045589c4c17c038dbc87943366f4af4440f7eea6887afb763871ac149b05 -test_ML_Ambiguity_Solver__performance_finding_ambiML.root: 284ff5c3a08c0b810938e4ac2f8ba8fe2babb17d4c202b624ed69fff731a9006 +test_ML_Ambiguity_Solver__performance_finding_ambiML.root: 166dd8bb189097c4957b7b02c04c41267868d72d9a08c4bb892985b06849cb76 test_refitting[odd]__trackstates_gsf_refit.root: e297749dc1e7eda3b8dea13defa0499986c584740d93e723a901b498b8e90c71 test_refitting[odd]__tracksummary_gsf_refit.root: d5085882e45a0b699194dff9f40a36e9291227bf65f9aaaf9087f9242ef5ae22 test_refitting[generic]__trackstates_gsf_refit.root: 4424fdf2f27575db825c1a59f8e53a1595946211cbd5b2c8d3a2f71cdcc77ae9