From d7090914de46a5188804309eac161265715080ef Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sat, 19 Oct 2024 12:10:20 +0200 Subject: [PATCH] rename outputs and labels in physmon; rename refs --- CI/physmon/phys_perf_mon.sh | 20 +++++++++--------- ..._ckf.root => performance_finding_ckf.root} | Bin ..._ckf.root => performance_finding_ckf.root} | Bin ..._ckf.root => performance_finding_ckf.root} | Bin ..._ckf.root => performance_finding_ckf.root} | Bin ..._ckf.root => performance_finding_ckf.root} | Bin ...root => performance_finding_ckf_ambi.root} | Bin ..._ckf.root => performance_finding_ckf.root} | Bin ...root => performance_finding_ckf_ambi.root} | Bin .../python/acts/examples/reconstruction.py | 2 +- Examples/Python/tests/root_file_hashes.txt | 2 +- Examples/Python/tests/test_examples.py | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename CI/physmon/reference/trackfinding_1muon/orthogonal/{performance_ckf.root => performance_finding_ckf.root} (100%) rename CI/physmon/reference/trackfinding_1muon/seeded/{performance_ckf.root => performance_finding_ckf.root} (100%) rename CI/physmon/reference/trackfinding_1muon/truth_estimated/{performance_ckf.root => performance_finding_ckf.root} (100%) rename CI/physmon/reference/trackfinding_1muon/truth_smeared/{performance_ckf.root => performance_finding_ckf.root} (100%) rename CI/physmon/reference/trackfinding_4muon_50vertices/{performance_ckf.root => performance_finding_ckf.root} (100%) rename CI/physmon/reference/trackfinding_4muon_50vertices/{performance_ckf_ambi.root => performance_finding_ckf_ambi.root} (100%) rename CI/physmon/reference/trackfinding_ttbar_pu200/{performance_ckf.root => performance_finding_ckf.root} (100%) rename CI/physmon/reference/trackfinding_ttbar_pu200/{performance_ckf_ambi.root => performance_finding_ckf_ambi.root} (100%) diff --git a/CI/physmon/phys_perf_mon.sh b/CI/physmon/phys_perf_mon.sh index 0e9646daa0c..c711ed538d3 100755 --- a/CI/physmon/phys_perf_mon.sh +++ b/CI/physmon/phys_perf_mon.sh @@ -223,11 +223,11 @@ function trackfinding() { fi run_histcmp \ - $outdir/data/$path/performance_ckf.root \ - $refdir/$path/performance_ckf.root \ + $outdir/data/$path/performance_finding_ckf.root \ + $refdir/$path/performance_finding_ckf.root \ "CKF finding performance | ${name}" \ - $path/performance_ckf.html \ - $path/performance_ckf_plots \ + $path/performance_finding_ckf.html \ + $path/performance_finding_ckf_plots \ --config $default_config run_histcmp \ @@ -252,17 +252,17 @@ function trackfinding() { run_histcmp \ $outdir/data/$path/tracksummary_ckf_hist.root \ $refdir/$path/tracksummary_ckf_hist.root \ - "Track Summary CKF | ${name}" \ + "CKF track summary | ${name}" \ $path/tracksummary_ckf.html \ $path/tracksummary_ckf_plots - if [ -f $refdir/$path/performance_ckf_ambi.root ]; then + if [ -f $refdir/$path/performance_finding_ckf_ambi.root ]; then run_histcmp \ - $outdir/data/$path/performance_ckf_ambi.root \ - $refdir/$path/performance_ckf_ambi.root \ + $outdir/data/$path/performance_finding_ckf_ambi.root \ + $refdir/$path/performance_finding_ckf_ambi.root \ "Ambisolver finding performance | ${name}" \ - $path/performance_ckf_ambi.html \ - $path/performance_ckf_ambi + $path/performance_finding_ckf_ambi.html \ + $path/performance_finding_ckf_ambi fi } diff --git a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_ckf.root b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_finding_ckf.root similarity index 100% rename from CI/physmon/reference/trackfinding_1muon/orthogonal/performance_ckf.root rename to CI/physmon/reference/trackfinding_1muon/orthogonal/performance_finding_ckf.root diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/performance_ckf.root b/CI/physmon/reference/trackfinding_1muon/seeded/performance_finding_ckf.root similarity index 100% rename from CI/physmon/reference/trackfinding_1muon/seeded/performance_ckf.root rename to CI/physmon/reference/trackfinding_1muon/seeded/performance_finding_ckf.root diff --git a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_finding_ckf.root similarity index 100% rename from CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_ckf.root rename to CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_finding_ckf.root diff --git a/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_finding_ckf.root similarity index 100% rename from CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_ckf.root rename to CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_finding_ckf.root diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf.root similarity index 100% rename from CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf.root rename to CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf.root diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf_ambi.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf_ambi.root similarity index 100% rename from CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf_ambi.root rename to CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf_ambi.root diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root similarity index 100% rename from CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf.root rename to CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf_ambi.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root similarity index 100% rename from CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf_ambi.root rename to CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root diff --git a/Examples/Python/python/acts/examples/reconstruction.py b/Examples/Python/python/acts/examples/reconstruction.py index 68f5f254550..91df4ee6fd9 100644 --- a/Examples/Python/python/acts/examples/reconstruction.py +++ b/Examples/Python/python/acts/examples/reconstruction.py @@ -1662,7 +1662,7 @@ def addTrackWriters( inputParticles="particles_selected", inputTrackParticleMatching="track_particle_matching", inputParticleTrackMatching="particle_track_matching", - filePath=str(outputDirRoot / f"performance_{name}.root"), + filePath=str(outputDirRoot / f"performance_finding_{name}.root"), ) s.addWriter(trackFinderPerfWriter) diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt index 21306d5c43f..b56415c0c05 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_ambiML.root: 284ff5c3a08c0b810938e4ac2f8ba8fe2babb17d4c202b624ed69fff731a9006 +test_ML_Ambiguity_Solver__performance_finding_ambiML.root: 284ff5c3a08c0b810938e4ac2f8ba8fe2babb17d4c202b624ed69fff731a9006 test_refitting[odd]__trackstates_gsf_refit.root: e297749dc1e7eda3b8dea13defa0499986c584740d93e723a901b498b8e90c71 test_refitting[odd]__tracksummary_gsf_refit.root: d5085882e45a0b699194dff9f40a36e9291227bf65f9aaaf9087f9242ef5ae22 test_refitting[generic]__trackstates_gsf_refit.root: 4424fdf2f27575db825c1a59f8e53a1595946211cbd5b2c8d3a2f71cdcc77ae9 diff --git a/Examples/Python/tests/test_examples.py b/Examples/Python/tests/test_examples.py index 9a2c45c7657..63c876764b8 100644 --- a/Examples/Python/tests/test_examples.py +++ b/Examples/Python/tests/test_examples.py @@ -1290,7 +1290,7 @@ def test_full_chain_odd_example_pythia_geant4(tmp_path): def test_ML_Ambiguity_Solver(tmp_path, assert_root_hash): # This test literally only ensures that the full chain example can run without erroring out - root_file = "performance_ambiML.root" + root_file = "performance_finding_ambiML.root" output_dir = "odd_output" assert not (tmp_path / root_file).exists()