added merged match from default and res match

moore_options/get_resolution_and_eff_data.py

@@ -36,11 +36,11 @@ from RecoConf.hlt1_tracking import (
     get_global_materiallocator,
 )
 
-decay = "D"
+decay = "test"
 
 options.evt_max = -1
 
-options.ntuple_file = f"data/resolutions_and_effs_{decay}_electron_weights.root"
+options.ntuple_file = f"data/resolutions_and_effs_{decay}_default_weights.root"
 options.input_type = "ROOT"
 
 

moore_options/residual_get_resolution_and_eff_data.py

@@ -45,7 +45,7 @@ from RecoConf.hlt1_tracking import (
 # sample = "Bs2PhiPhi_MU"
 
 
-decay = "D"
+decay = "B"
 
 
 options.evt_max = -1
@@ -92,6 +92,10 @@ def run_tracking_resolution():
         InputTracks=tracks["Match"],
         LinksToLHCbIDs=links_to_lhcbids,
     )
+    links_to_mergedmatch = make_links_tracks_mcparticles(
+        InputTracks=tracks["MergedMatch"],
+        LinksToLHCbIDs=links_to_lhcbids,
+    )
     links_to_best = make_links_tracks_mcparticles(
         InputTracks=tracks["BestLong"],
         LinksToLHCbIDs=links_to_lhcbids,
@@ -134,6 +138,14 @@ def run_tracking_resolution():
         get_mc_categories("Match"),
         get_hit_type_mask("Match"),
     )
+    eff_checker_mergedmatch = check_tracking_efficiency(
+        "MergedMatch",
+        tracks["MergedMatch"],
+        links_to_mergedmatch,
+        links_to_lhcbids,
+        get_mc_categories("Match"),
+        get_hit_type_mask("Match"),
+    )
     eff_checker_best_long = check_tracking_efficiency(
         "BestLong",
         tracks["BestLong"],
@@ -158,6 +170,7 @@ def run_tracking_resolution():
         res_checker_seed,
         eff_checker_forward,
         eff_checker_match,
+        eff_checker_mergedmatch,
         eff_checker_best_long,
         eff_checker_seed,
     ]

scripts/CompareEfficiency.py

@@ -67,6 +67,7 @@ def getOriginFolders():
         "Upstream": {},
         "Forward": {},
         "Match": {},
+        "MergedMatch": {},
         "BestLong": {},
         "Seed": {},
     }
@@ -75,6 +76,9 @@ def getOriginFolders():
     basedict["Upstream"]["folder"] = "UpstreamTrackChecker/"
     basedict["Forward"]["folder"] = "ForwardTrackChecker" + unique_name_ext_re() + "/"
     basedict["Match"]["folder"] = "MatchTrackChecker" + unique_name_ext_re() + "/"
+    basedict["MergedMatch"]["folder"] = (
+        "MergedMatchTrackChecker" + unique_name_ext_re() + "/"
+    )
     basedict["BestLong"]["folder"] = "BestLongTrackChecker" + unique_name_ext_re() + "/"
     basedict["Seed"]["folder"] = "SeedTrackChecker" + unique_name_ext_re() + "/"
 
@@ -92,6 +96,7 @@ def getTrackNames():
         "Upstream": {},
         "Forward": {},
         "Match": {},
+        "MergedMatch": {},
         "BestLong": {},
         "Seed": {},
     }
@@ -100,6 +105,7 @@ def getTrackNames():
     basedict["Upstream"] = "VeloUT"
     basedict["Forward"] = "Forward"
     basedict["Match"] = "Match"
+    basedict["MergedMatch"] = "MergedMatch"
     basedict["BestLong"] = "BestLong"
     basedict["Seed"] = "Seed"
     return basedict
@@ -136,6 +142,7 @@ def getGhostHistoNames():
         "Upstream": {},
         "Forward": {},
         "Match": {},
+        "MergedMatch": {},
         "BestLong": {},
         "Seed": {},
     }
@@ -144,6 +151,7 @@ def getGhostHistoNames():
     basedict["Upstream"] = ["eta", "p", "pt", "nPV"]
     basedict["Forward"] = ["eta", "p", "pt", "nPV"]
     basedict["Match"] = ["eta", "p", "pt", "nPV"]
+    basedict["MergedMatch"] = basedict["Match"]
     basedict["BestLong"] = ["eta", "p", "pt", "nPV"]
     basedict["Seed"] = ["eta", "p", "pt", "nPV"]
 
@@ -246,7 +254,12 @@ def get_eff(eff, hist, tf, histoName, label, var):
                 eff[lab].SetTitle(lab + " Forward, e^{-}")
             else:
                 eff[lab].SetTitle(lab + " Forward")
-        if histoName.find("Match") != -1:
+        if histoName.find("Merged") != -1:
+            if histoName.find("electron") != -1:
+                eff[lab].SetTitle(lab + " MergedMatch, e^{-}")
+            else:
+                eff[lab].SetTitle(lab + " MergedMatch")
+        elif histoName.find("Match") != -1:
             if histoName.find("electron") != -1:
                 eff[lab].SetTitle(lab + " Match, e^{-}")
             else:

scripts/MyPrCheckerEfficiency.py

@@ -52,6 +52,7 @@ def getOriginFolders():
         "Match": {},
         "BestLong": {},
         "Seed": {},
+        "MergedMatch": {},
     }
     # evtl anpassen wenn die folders anders heissen
     basedict["Velo"]["folder"] = "VeloTrackChecker/"
@@ -60,6 +61,9 @@ def getOriginFolders():
     basedict["Match"]["folder"] = "MatchTrackChecker" + unique_name_ext_re() + "/"
     basedict["BestLong"]["folder"] = "BestLongTrackChecker" + unique_name_ext_re() + "/"
     basedict["Seed"]["folder"] = "SeedTrackChecker" + unique_name_ext_re() + "/"
+    basedict["MergedMatch"]["folder"] = (
+        "MergedMatchTrackChecker" + unique_name_ext_re() + "/"
+    )
 
     # basedict["Forward"]["folder"] = "ForwardTrackChecker_7a0dbfa7/"
     # basedict["Match"]["folder"] = "MatchTrackChecker_29e3152a/"
@@ -77,6 +81,7 @@ def getTrackNames():
         "Match": {},
         "BestLong": {},
         "Seed": {},
+        "MergedMatch": {},
     }
 
     basedict["Velo"] = "Velo"
@@ -85,6 +90,7 @@ def getTrackNames():
     basedict["Match"] = "Match"
     basedict["BestLong"] = "BestLong"
     basedict["Seed"] = "Seed"
+    basedict["MergedMatch"] = "MergedMatch"
     return basedict
 
 
@@ -113,6 +119,7 @@ def getGhostHistoNames():
         "Upstream": {},
         "Forward": {},
         "Match": {},
+        "MergedMatch": {},
         "BestLong": {},
         "Seed": {},
     }
@@ -121,6 +128,7 @@ def getGhostHistoNames():
     basedict["Upstream"] = ["eta", "p", "pt", "nPV"]
     basedict["Forward"] = ["eta", "p", "pt", "nPV"]
     basedict["Match"] = ["eta", "p", "pt", "nPV"]
+    basedict["MergedMatch"] = basedict["Match"]
     basedict["BestLong"] = ["eta", "p", "pt", "nPV"]
     basedict["Seed"] = ["eta", "p", "pt", "nPV"]
 

scripts/utils/CompareConfigHistos.py

@@ -25,19 +25,19 @@ def getCompare():
     basedict["long"]["BestLong"] = "01_long"
     basedict["long"]["Seed"] = "02_long"
     basedict["long"]["Match"] = "01_long"
-    basedict["long"]["ResidualMatch"] = "01_long"
+    basedict["long"]["MergedMatch"] = "01_long"
     basedict["long"]["Forward"] = "01_long"
 
     basedict["long_fromB"]["BestLong"] = "05_long_fromB"
     basedict["long_fromB"]["Seed"] = "04_long_fromB"
     basedict["long_fromB"]["Match"] = "05_long_fromB"
-    basedict["long_fromB"]["ResidualMatch"] = "05_long_fromB"
+    basedict["long_fromB"]["MergedMatch"] = "05_long_fromB"
     basedict["long_fromB"]["Forward"] = "05_long_fromB"
 
     basedict["long_fromB_P>5GeV"]["BestLong"] = "06_long_fromB_P>5GeV"
     basedict["long_fromB_P>5GeV"]["Seed"] = "05_long_fromB_P>5GeV"
     basedict["long_fromB_P>5GeV"]["Match"] = "06_long_fromB_P>5GeV"
-    basedict["long_fromB_P>5GeV"]["ResidualMatch"] = "06_long_fromB_P>5GeV"
+    basedict["long_fromB_P>5GeV"]["MergedMatch"] = "06_long_fromB_P>5GeV"
     basedict["long_fromB_P>5GeV"]["Forward"] = "06_long_fromB_P>5GeV"
 
     return basedict
@@ -47,12 +47,14 @@ def getCompColors():
     basedict = {
         "Forward": {},
         "Match": {},
+        "MergedMatch": {},
         "Seed": {},
         "BestLong": {},
     }
 
     basedict["Forward"] = 0
     basedict["Match"] = 4
+    basedict["MergedMatch"] = 5
     basedict["Seed"] = 6
     basedict["BestLong"] = 1
 

scripts/utils/ConfigHistos.py

@@ -77,7 +77,7 @@ def getCuts():
         "Forward": {},
         "MuonMatch": {},
         "Match": {},
-        "ResidualMatch": {},
+        "MergedMatch": {},
         "Seed": {},
         "Downstream": {},
         "BestLong": {},
@@ -131,7 +131,7 @@ def getCuts():
         "11_UT_long_fromB_P>3GeV_Pt>0.5GeV",
     ]
 
-    basedict["ResidualMatch"] = basedict["Match"]
+    basedict["MergedMatch"] = basedict["Match"]
 
     basedict["Seed"] = [
         "01_hasT",
@@ -359,49 +359,47 @@ def categoriesDict():
     basedict["Match"]["10_long_strange_P>3GeV_Pt>0.5GeV"]["plotElectrons"] = False
     basedict["Match"]["11_UT_long_fromB_P>3GeV_Pt>0.5GeV"]["plotElectrons"] = False
 
-    # ResidualMATCH
-    basedict["ResidualMatch"]["01_long"]["Electrons"] = "07_long_electrons"
-    basedict["ResidualMatch"]["05_long_fromB"]["Electrons"] = "08_long_fromB_electrons"
-    basedict["ResidualMatch"]["06_long_fromB_P>5GeV"][
+    # MergedMatch
+    basedict["MergedMatch"]["01_long"]["Electrons"] = "07_long_electrons"
+    basedict["MergedMatch"]["05_long_fromB"]["Electrons"] = "08_long_fromB_electrons"
+    basedict["MergedMatch"]["06_long_fromB_P>5GeV"][
         "Electrons"
     ] = "09_long_fromB_electrons_P>5GeV"
-    basedict["ResidualMatch"]["10_long_fromB_P>3GeV_Pt>0.5GeV"][
+    basedict["MergedMatch"]["10_long_fromB_P>3GeV_Pt>0.5GeV"][
         "Electrons"
     ] = "10_long_fromB_electrons_P>3GeV_Pt>0.5GeV"
 
-    basedict["ResidualMatch"]["01_long"]["title"] = "Long, 2 <#eta < 5"
-    basedict["ResidualMatch"]["02_long_P>5GeV"]["title"] = "Long, p>5GeV, 2 <#eta < 5"
-    basedict["ResidualMatch"]["03_long_strange"][
+    basedict["MergedMatch"]["01_long"]["title"] = "Long, 2 <#eta < 5"
+    basedict["MergedMatch"]["02_long_P>5GeV"]["title"] = "Long, p>5GeV, 2 <#eta < 5"
+    basedict["MergedMatch"]["03_long_strange"][
         "title"
     ] = "Long, from strange, 2 <#eta < 5"
-    basedict["ResidualMatch"]["04_long_strange_P>5GeV"][
+    basedict["MergedMatch"]["04_long_strange_P>5GeV"][
         "title"
     ] = "Long, from strange, p>5GeV, 2 <#eta < 5"
-    basedict["ResidualMatch"]["05_long_fromB"]["title"] = "Long from B, 2 <#eta < 5"
-    basedict["ResidualMatch"]["06_long_fromB_P>5GeV"][
+    basedict["MergedMatch"]["05_long_fromB"]["title"] = "Long from B, 2 <#eta < 5"
+    basedict["MergedMatch"]["06_long_fromB_P>5GeV"][
         "title"
     ] = "Long from B, p>5GeV 2 <#eta < 5"
-    basedict["ResidualMatch"]["10_long_fromB_P>3GeV_Pt>0.5GeV"][
+    basedict["MergedMatch"]["10_long_fromB_P>3GeV_Pt>0.5GeV"][
         "title"
     ] = "Long from B, p>3GeV, pt>0.5GeV, 2 <#eta < 5"
-    basedict["ResidualMatch"]["10_long_strange_P>3GeV_Pt>0.5GeV"][
+    basedict["MergedMatch"]["10_long_strange_P>3GeV_Pt>0.5GeV"][
         "title"
     ] = "Long from strange, p>3GeV, pt>0.5GeV, 2 <#eta < 5"
-    basedict["ResidualMatch"]["11_UT_long_fromB_P>3GeV_Pt>0.5GeV"][
+    basedict["MergedMatch"]["11_UT_long_fromB_P>3GeV_Pt>0.5GeV"][
         "title"
     ] = "UT Long from B, p>3GeV, pt>0.5GeV, 2 <#eta < 5"
 
-    basedict["ResidualMatch"]["01_long"]["plotElectrons"] = True
-    basedict["ResidualMatch"]["02_long_P>5GeV"]["plotElectrons"] = False
-    basedict["ResidualMatch"]["03_long_strange"]["plotElectrons"] = False
-    basedict["ResidualMatch"]["04_long_strange_P>5GeV"]["plotElectrons"] = False
-    basedict["ResidualMatch"]["05_long_fromB"]["plotElectrons"] = True
-    basedict["ResidualMatch"]["06_long_fromB_P>5GeV"]["plotElectrons"] = True
-    basedict["ResidualMatch"]["10_long_fromB_P>3GeV_Pt>0.5GeV"]["plotElectrons"] = False
-    basedict["ResidualMatch"]["10_long_strange_P>3GeV_Pt>0.5GeV"][
-        "plotElectrons"
-    ] = False
-    basedict["ResidualMatch"]["11_UT_long_fromB_P>3GeV_Pt>0.5GeV"][
+    basedict["MergedMatch"]["01_long"]["plotElectrons"] = True
+    basedict["MergedMatch"]["02_long_P>5GeV"]["plotElectrons"] = False
+    basedict["MergedMatch"]["03_long_strange"]["plotElectrons"] = False
+    basedict["MergedMatch"]["04_long_strange_P>5GeV"]["plotElectrons"] = False
+    basedict["MergedMatch"]["05_long_fromB"]["plotElectrons"] = True
+    basedict["MergedMatch"]["06_long_fromB_P>5GeV"]["plotElectrons"] = True
+    basedict["MergedMatch"]["10_long_fromB_P>3GeV_Pt>0.5GeV"]["plotElectrons"] = False
+    basedict["MergedMatch"]["10_long_strange_P>3GeV_Pt>0.5GeV"]["plotElectrons"] = False
+    basedict["MergedMatch"]["11_UT_long_fromB_P>3GeV_Pt>0.5GeV"][
         "plotElectrons"
     ] = False