Features/new config sturcture

configs/V44nano/object_performance/disp_ht.yaml

@@ -8,9 +8,6 @@ HtoLLPto4b_M125_Phi60_ctau100_promptHT:
     L1TrackHT:HT: "ht"
     L1ExtTrackHT:HT: "ht"
   thresholds: [50, 100]
-  # scalings:
-  #   method: "naive"
-  #   threshold: 0.90
   xlabel: "Gen. HT (GeV)"
   ylabel: "Trigger Efficiency (<threshold> GeV)"
   binning:

configs/V44nano/object_performance/electron_iso.yaml

@@ -4,7 +4,7 @@ ElectronsIsolation_Barrel:
   match_test_to_ref: True
   iso_vs_efficiency: True
   reference_object:
-    GenPart:reference_electron_barrel: "pt"
+    GenPart:electron_iso:barrel_iso: "pt"
   test_objects:
     L1tkElectron:NoIsoForIso: "relIso"
   xlabel: "Isolation"
@@ -20,7 +20,7 @@ ElectronsIsolation_Endcap:
   match_test_to_ref: True
   iso_vs_efficiency: True
   reference_object:
-    GenPart:reference_electron_endcap: "pt"
+    GenPart:electron:endcap_iso: "pt"
   test_objects:
     L1tkElectron:NoIsoForIso: "relIso"
   xlabel: "Isolation"

configs/V44nano/object_performance/electron_matching.yaml

@@ -1,9 +1,9 @@
 ElectronsMatchingBarrel:
-  sample: DYLL_M50
+  sample: DYLL_M50 # 
   version: V44nano
-  match_test_to_ref: True
+  match_test_to_ref: True # Delta R matching 
   reference_object:
-    GenPart:reference_electron:barrel: "pt"
+    GenPart:electron:barrel: "pt"
   test_objects:
     L1EG:default: "pt"
     L1tkElectron:NoIso: "pt"
@@ -38,7 +38,7 @@ ElectronsMatchingEndcap:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    GenPart:reference_electron_endcap: "pt"
+    GenPart:electron:endcap: "pt"
   test_objects:
     L1EG:default: "pt"
     L1tkElectron:NoIso: "pt"

configs/V44nano/object_performance/electron_matching_eta.yaml

@@ -3,7 +3,7 @@ ElectronsMatching_Eta_Pt10to25:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    GenPart:reference_electron_pt10to25: "eta"
+    GenPart:electron_pt10to25: "eta"
   test_objects:
     L1EG:default: "eta"
     L1tkElectron:NoIso: "eta"
@@ -21,7 +21,7 @@ ElectronsMatching_Eta_Pt25toInf:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    GenPart:reference_electron_pt25toInf: "eta"
+    GenPart:electron_pt25toInf: "eta"
   test_objects:
     L1EG:default: "eta"
     L1tkElectron:NoIso: "eta"

configs/V44nano/object_performance/electron_trigger.yaml

@@ -3,7 +3,7 @@ ElectronsTriggerBarrel:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    GenPart:reference_electron_trigger_barrel: "pt"
+    GenPart:electron_trigger:barrel: "pt"
   test_objects:
     L1EG:default:barrel: "pt"
     L1tkElectron:NoIso:barrel: "pt"
@@ -25,7 +25,7 @@ ElectronsTriggerEndcap:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    GenPart:reference_electron_trigger_endcap: "pt"
+    GenPart:electron_trigger:endcap: "pt"
   test_objects:
     L1EG:default:endcap: "pt"
     L1tkElectron:NoIso:endcap: "pt"

configs/V44nano/object_performance/jets_matching.yaml

@@ -3,12 +3,7 @@ JetMatchingBarrel:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    GenJet:reference_barrel: "pt"
-    cuts:
-      event:
-        - "abs({eta}) < 1.5"
-      object:
-        - "abs({eta}) < 2.4"
+    GenJet:jet:barrel: "pt"
   test_objects:
     L1puppiJetHisto:default: "pt"
     L1puppiJetSC4:default: "pt"
@@ -26,7 +21,7 @@ JetMatchingEndcap:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    GenJet:reference_endcap: "pt"
+    GenJet:jet:endcap: "pt"
   test_objects:
     L1puppiJetHisto:default: "pt"
     L1puppiJetSC4:default: "pt"
@@ -44,7 +39,7 @@ JetMatchingForward:
   sample: TT
   match_test_to_ref: True
   reference_object:
-    GenJet:reference_forward: "pt"
+    GenJet:default:forward: "pt"
   test_objects:
     L1puppiJetHisto:default: "pt"
     L1puppiJetSC4:default: "pt"
@@ -62,7 +57,7 @@ JetMatchingBarrelSC8:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    GenJetAK8:reference_barrel: "pt"
+    GenJetAK8:jet:barrel: "pt"
   test_objects:
     L1puppiJetSC8:default:barrel: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
@@ -77,7 +72,7 @@ JetMatchingEndcapSC8:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    GenJetAK8:reference_endcap: "pt"
+    GenJetAK8:jet:endcap: "pt"
   test_objects:
     L1puppiJetSC8:default:endcap: "pt"
   xlabel: "Gen. $p_T$ (GeV)"

configs/V44nano/object_performance/jets_matching_eta.yaml

@@ -1,9 +1,24 @@
+JetMatching_Eta_SC8_Pt100ToInf:
+  sample: TT
+  version: V44nano
+  match_test_to_ref: True
+  reference_object: 
+    GenJetAK8:jet_matching_SC8_Pt100ToInf: "eta"
+  test_objects:
+    L1puppiJetSC8:default: "eta"
+  xlabel: "Gen. $\\eta$"
+  ylabel: "Matching Efficiency (>100 GeV)"
+  binning:
+    min: -5
+    max: 5
+    step: 0.25
+
 JetMatching_Eta_Pt40To100:
   sample: TT
   version: V44nano
   match_test_to_ref: True
   reference_object: 
-    GenJet:reference_Pt40To100: "eta"
+    GenJet:jet_Pt40To100: "eta" # TODO
   test_objects:
     L1puppiJetHisto:default: "eta"
     L1puppiJetSC4:default: "eta"
@@ -21,7 +36,7 @@ JetMatching_Eta_Pt100ToInf:
   version: V44nano
   match_test_to_ref: True
   reference_object: 
-    GenJet:reference_Pt100ToInf: "eta"
+    GenJet:jet_Pt100ToInf: "eta"
   test_objects:
     L1puppiJetHisto:default: "eta"
     L1puppiJetSC4:default: "eta"
@@ -39,7 +54,7 @@ JetMatching_Eta_Pt100ToInf_extEta:
   version: V44nano
   match_test_to_ref: True
   reference_object: 
-    GenJet:reference_Pt100ToInf_extEta: "eta"
+    GenJet:jet_Pt100ToInf_extEta: "eta"
   test_objects:
     L1caloJet:default: "eta"
   xlabel: "Gen. $\\eta$"
@@ -48,18 +63,3 @@ JetMatching_Eta_Pt100ToInf_extEta:
     min: -5.5
     max: 5.5
     step: 0.25
-
-JetMatching_Eta_SC8_Pt100ToInf:
-  sample: TT
-  version: V44nano
-  match_test_to_ref: True
-  reference_object: 
-    GenJetAK8:reference_matching_SC8_Pt100ToInf: "eta"
-  test_objects:
-    L1puppiJetSC8:default: "eta"
-  xlabel: "Gen. $\\eta$"
-  ylabel: "Matching Efficiency (>100 GeV)"
-  binning:
-    min: -5
-    max: 5
-    step: 0.25

configs/V44nano/object_performance/jets_matching_wBTag.yaml

@@ -3,7 +3,7 @@ JetMatching_Eta_Pt40To100_ExtendedVsRegular:
   version: V44nano
   match_test_to_ref: True
   reference_object: 
-    GenJet:reference_Pt40To100: "eta"
+    GenJet:jet_Pt40To100: "eta"
   test_objects:
     L1puppiJetSC4:default: "eta"
     L1puppiExtJetSC4:default: "eta"
@@ -19,7 +19,7 @@ JetMatching_Eta_Pt100ToInf_ExtendedVsRegular:
   version: V44nano
   match_test_to_ref: True
   reference_object: 
-    GenJet:reference_Pt100ToInf: "eta"
+    GenJet:jet_Pt100ToInf: "eta"
   test_objects:
     L1puppiJetSC4:default: "eta"
     L1puppiExtJetSC4:default: "eta"
@@ -35,7 +35,7 @@ JetMatching_Eta_Pt30ToInf_genBJets:
   version: V44nano
   match_test_to_ref: True
   reference_object: 
-    GenJet:reference_Pt30ToInf_genBJets: "eta"
+    GenJet:jet_Pt30ToInf_genBJets: "eta"
   test_objects:
     L1puppiExtJetSC4:bjetnn: "eta"
   xlabel: "Gen. $\\eta$"
@@ -50,7 +50,7 @@ JetMatching_Eta_Pt30ToInf_genNotBJets:
   version: V44nano
   match_test_to_ref: True
   reference_object: 
-    GenJet:reference_Pt30ToInf_genNotBJets: "eta"
+    GenJet:jet_Pt30ToInf_genNotBJets: "eta"
   test_objects:
     L1puppiExtJetSC4:bjetnn: "eta"
   xlabel: "Gen. $\\eta$"
@@ -65,7 +65,7 @@ JetMatching_Pt_Pt30ToInf_genBJets:
   version: V44nano
   match_test_to_ref: True
   reference_object: 
-    GenJet:reference_Pt30ToInf_genBJets: "pt"
+    GenJet:jet_Pt30ToInf_genBJets: "pt"
   test_objects:
     L1puppiExtJetSC4:bjetnn: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
@@ -80,7 +80,7 @@ JetMatching_Pt_Pt30ToInf_genNotBJets:
   version: V44nano
   match_test_to_ref: True
   reference_object: 
-    GenJet:reference_Pt30ToInf_genNotBJets: "eta"
+    GenJet:jet_Pt30ToInf_genNotBJets: "pt"  
   test_objects:
     L1puppiExtJetSC4:bjetnn: "pt"
   xlabel: "Gen. $p_T$ (GeV)"

configs/V44nano/object_performance/jets_sc8_trigger.yaml

@@ -1,9 +1,10 @@
+
 JetTurnonBarrelSC8:
   version: V44nano
   sample: TT
   match_test_to_ref: True
   reference_object:
-    GenJetAK8:reference_barrel: "pt"
+    GenJetAK8:jet:barrel: "pt"
   test_objects:
     L1puppiJetSC8:default:barrel: "pt"
   thresholds: [150]
@@ -22,7 +23,7 @@ JetTurnonEndcapSC8:
   sample: TT
   match_test_to_ref: True
   reference_object:
-    GenJetAK8:reference_endcap: "pt"
+    GenJetAK8:jet:endcap: "pt"
   test_objects:
     L1puppiJetSC8:default:endcap: "pt"
   thresholds: [150]
@@ -41,7 +42,7 @@ JetTurnonForwardSC8:
   sample: TT
   match_test_to_ref: True
   reference_object:
-    GenJetAK8:reference_forward: "pt"
+    GenJetAK8:default:forward: "pt"
   test_objects:
     L1puppiJetSC8:default:forward: "pt"
   thresholds: [150]

configs/V44nano/object_performance/jets_trigger.yaml

@@ -3,7 +3,7 @@ JetTurnonBarrel:
   sample: TT
   match_test_to_ref: True
   reference_object:
-    GenJet:reference_barrel: "pt"
+    GenJet:jet:barrel: "pt"
   test_objects:
     # L1puppiJetHisto:default:barrel: "pt"
     L1puppiJetSC4:default:barrel: "pt"
@@ -25,7 +25,7 @@ JetTurnonEndcap:
   sample: TT
   match_test_to_ref: True
   reference_object:
-    GenJet:reference_endcap: "pt"
+    GenJet:jet:endcap: "pt"
   test_objects:
     # L1puppiJetHisto:default:endcap: "pt"
     L1puppiJetSC4:default:endcap: "pt"
@@ -47,7 +47,7 @@ JetTurnonForward:
   sample: TT
   match_test_to_ref: True
   reference_object:
-    GenJet:reference_forward: "pt"
+    GenJet:default:forward: "pt"
   test_objects:
     # L1puppiJetHisto:default:forward: "pt"
     L1puppiJetSC4:default:forward: "pt"

configs/V44nano/object_performance/muonTF_matching.yaml

@@ -3,15 +3,7 @@ MuonTFsMatchingBarrel:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    object: "GenPart"
-    x_arg: "pt"
-    label: "Gen Muons"
-    cuts:
-      event:
-        - "(({statusFlags}>>7)&1) == 1"
-        - "abs({pdgId}) == 13"
-      object:
-        - "abs({eta}) < 0.83"
+    GenPart:muon_barrel: "pt"
   test_objects:
     L1gmtMuon:default:barrel: "pt"
     L1MuonKMTF:default:barrel: "pt"
@@ -30,16 +22,7 @@ MuonTFsMatchingOverlap:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    object: "GenPart"
-    x_arg: "pt"
-    label: "Gen Muons"
-    cuts:
-      event:
-        - "(({statusFlags}>>7)&1) == 1"
-        - "abs({pdgId}) == 13"
-      object:
-        - "abs({eta}) > 0.83"
-        - "abs({eta}) < 1.24"
+    GenPart:muon_overlap: "pt"
   test_objects:
     L1gmtMuon:default:overlap: "pt"
     L1MuonKMTF:default:overlap: "pt"
@@ -58,16 +41,7 @@ MuonTFsMatchingEndcap:
   version: V44nano
   match_test_to_ref: True
   reference_object:
-    object: "GenPart"
-    x_arg: "pt"
-    label: "Gen Muons"
-    cuts:
-      event:
-        - "(({statusFlags}>>7)&1) == 1"
-        - "abs({pdgId}) == 13"
-      object:
-        - "abs({eta}) > 1.24"
-        - "abs({eta}) < 2.4"
+    GenPart:muon_endcap: "pt"
   test_objects:
     L1gmtMuon:default:endcap: "pt"
     L1MuonKMTF:default:endcap: "pt"