added ML solver to CI

Corentin-Allaire · Aug 28, 2024 · c6e3c62 · c6e3c62
1 parent d7e1157
commit c6e3c62
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 13 deletions.
diff --git a/CI/physmon/phys_perf_mon.sh b/CI/physmon/phys_perf_mon.sh
@@ -241,13 +241,22 @@ function trackfinding() {
         $path/tracksummary_ckf.html \
         $path/tracksummary_ckf_plots
 
-    if [ -f $refdir/$path/performance_ckf_ambi.root ]; then
+    if [ -f $refdir/$path/performance_ckf_greedy_solver.root ]; then
         run_histcmp \
-            $outdir/data/$path/performance_ckf_ambi.root \
-            $refdir/$path/performance_ckf_ambi.root \
+            $outdir/data/$path/performance_ckf_greedy_solver.root \
+            $refdir/$path/performance_ckf_greedy_solver.root \
             "Ambisolver | ${name}" \
-            $path/performance_ckf_ambi.html \
-            $path/performance_ckf_ambi
+            $path/performance_ckf_greedy_solver.html \
+            $path/performance_ckf_greedy_solver
+    fi
+
+    if [ -f $refdir/$path/performance_ml_solver.root ]; then   
+        run_histcmp \
+            $outdir/data/$path/performance_ml_solver.root \
+            $refdir/$path/performance_ml_solver.root \
+            "ML Ambisolver | ${name}" \
+            $path/performance_ml_solver.html
+            $path/performance_ml
     fi
 }
 

diff --git a/CI/physmon/workflows/physmon_trackfinding_4muon_50vertices.py b/CI/physmon/workflows/physmon_trackfinding_4muon_50vertices.py
@@ -193,7 +193,7 @@
 
     shutil.move(
         tp / "performance_ambi.root",
-        tp / "performance_ckf_ambi.root",
+        tp / "performance_ckf_greedy_solver.root",
     )
     for vertexing in ["ivf_notime", "amvf_gauss_notime", "amvf_grid_time"]:
         shutil.move(
@@ -205,7 +205,7 @@
         "performance_seeding.root",
         "tracksummary_ckf.root",
         "performance_ckf.root",
-        "performance_ckf_ambi.root",
+        "performance_ckf_greedy_solver.root",
         "performance_vertexing_ivf_notime.root",
         "performance_vertexing_amvf_gauss_notime.root",
         "performance_vertexing_amvf_grid_time.root",

diff --git a/CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py b/CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py
@@ -19,7 +19,9 @@
     CkfConfig,
     addCKFTracks,
     addAmbiguityResolution,
+    addAmbiguityResolutionML,
     AmbiguityResolutionConfig,
+    AmbiguityResolutionMLConfig,
     addVertexFitting,
     VertexFinder,
     TrackSelectorConfig,
@@ -133,7 +135,16 @@
             maximumIterations=100000,
             nMeasurementsMin=6,
         ),
-        outputDirRoot=tp,
+        outputDirRoot=tp / "greedy_solver",
+    )
+
+    addAmbiguityResolutionML(
+        s,
+        AmbiguityResolutionMLConfig(
+            maximumSharedHits=3, maximumIterations=1000000, nMeasurementsMin=6
+        ),
+        outputDirRoot=tp / "ml_solver",
+        onnxModelFile=Path(__file__).resolve().parent.parent.parent / "thirdparty/OpenDataDetector/data/duplicateClassifier.onnx",
     )
 
     s.addAlgorithm(
@@ -171,21 +182,24 @@
 
     s.run()
 
-    shutil.move(
-        tp / "performance_ambi.root",
-        tp / "performance_ckf_ambi.root",
-    )
     for vertexing in ["amvf_gauss_notime", "amvf_grid_time"]:
         shutil.move(
             tp / f"{vertexing}/performance_vertexing.root",
             tp / f"performance_vertexing_{vertexing}.root",
         )
 
+    for solver in ["greedy_solver", "ml_solver"]:
+        shutil.move(
+            tp / f"{solver}/performance_ambi.root",
+            tp / f"performance_ckf_{solver}.root",
+        )
+
     for file in [
         "performance_seeding.root",
         "tracksummary_ckf.root",
         "performance_ckf.root",
-        "performance_ckf_ambi.root",
+        "performance_ckf_greedy_solver.root",
+        "performance_ckf_ml_solver",
         "performance_vertexing_amvf_gauss_notime.root",
         "performance_vertexing_amvf_grid_time.root",
     ]: