diff --git a/analysis/data/EGammaSF/2022post/electron.json.gz b/analysis/data/EGammaSF/2022post/electron.json.gz index 15b23143c..6f370ce35 100644 Binary files a/analysis/data/EGammaSF/2022post/electron.json.gz and b/analysis/data/EGammaSF/2022post/electron.json.gz differ diff --git a/analysis/data/EGammaSF/2022post/electronID_highPt.json.gz b/analysis/data/EGammaSF/2022post/electronID_highPt.json.gz new file mode 100644 index 000000000..6271fdd96 Binary files /dev/null and b/analysis/data/EGammaSF/2022post/electronID_highPt.json.gz differ diff --git a/analysis/data/EGammaSF/2022post/electronSS_EtDependent.json.gz b/analysis/data/EGammaSF/2022post/electronSS_EtDependent.json.gz index 551811545..a0a31f0db 100644 Binary files a/analysis/data/EGammaSF/2022post/electronSS_EtDependent.json.gz and b/analysis/data/EGammaSF/2022post/electronSS_EtDependent.json.gz differ diff --git a/analysis/data/EGammaSF/2022post/photon.json.gz b/analysis/data/EGammaSF/2022post/photon.json.gz index ece28f934..daeceb1ee 100644 Binary files a/analysis/data/EGammaSF/2022post/photon.json.gz and b/analysis/data/EGammaSF/2022post/photon.json.gz differ diff --git a/analysis/data/EGammaSF/2022post/photonID_highPt.json.gz b/analysis/data/EGammaSF/2022post/photonID_highPt.json.gz new file mode 100644 index 000000000..ccbd3660f Binary files /dev/null and b/analysis/data/EGammaSF/2022post/photonID_highPt.json.gz differ diff --git a/analysis/data/EGammaSF/2022post/photonSS_EtDependent.json.gz b/analysis/data/EGammaSF/2022post/photonSS_EtDependent.json.gz index 8c4f8e201..fbc2341f4 100644 Binary files a/analysis/data/EGammaSF/2022post/photonSS_EtDependent.json.gz and b/analysis/data/EGammaSF/2022post/photonSS_EtDependent.json.gz differ diff --git a/analysis/data/EGammaSF/2022pre/electron.json.gz b/analysis/data/EGammaSF/2022pre/electron.json.gz index 8ccee93be..363095377 100644 Binary files a/analysis/data/EGammaSF/2022pre/electron.json.gz and b/analysis/data/EGammaSF/2022pre/electron.json.gz differ diff --git a/analysis/data/EGammaSF/2022pre/electronID_highPt.json.gz b/analysis/data/EGammaSF/2022pre/electronID_highPt.json.gz new file mode 100644 index 000000000..0bca85be0 Binary files /dev/null and b/analysis/data/EGammaSF/2022pre/electronID_highPt.json.gz differ diff --git a/analysis/data/EGammaSF/2022pre/electronSS_EtDependent.json.gz b/analysis/data/EGammaSF/2022pre/electronSS_EtDependent.json.gz index 810b20a80..e0a7947b5 100644 Binary files a/analysis/data/EGammaSF/2022pre/electronSS_EtDependent.json.gz and b/analysis/data/EGammaSF/2022pre/electronSS_EtDependent.json.gz differ diff --git a/analysis/data/EGammaSF/2022pre/photon.json.gz b/analysis/data/EGammaSF/2022pre/photon.json.gz index faad5c388..c6a0085b5 100644 Binary files a/analysis/data/EGammaSF/2022pre/photon.json.gz and b/analysis/data/EGammaSF/2022pre/photon.json.gz differ diff --git a/analysis/data/EGammaSF/2022pre/photonID_highPt.json.gz b/analysis/data/EGammaSF/2022pre/photonID_highPt.json.gz new file mode 100644 index 000000000..42efd203b Binary files /dev/null and b/analysis/data/EGammaSF/2022pre/photonID_highPt.json.gz differ diff --git a/analysis/data/EGammaSF/2022pre/photonSS_EtDependent.json.gz b/analysis/data/EGammaSF/2022pre/photonSS_EtDependent.json.gz index a90bca96b..8fff6f833 100644 Binary files a/analysis/data/EGammaSF/2022pre/photonSS_EtDependent.json.gz and b/analysis/data/EGammaSF/2022pre/photonSS_EtDependent.json.gz differ diff --git a/analysis/data/EGammaSF/2023post/electron.json.gz b/analysis/data/EGammaSF/2023post/electron.json.gz index 5aa13380d..d9a48f14c 100644 Binary files a/analysis/data/EGammaSF/2023post/electron.json.gz and b/analysis/data/EGammaSF/2023post/electron.json.gz differ diff --git a/analysis/data/EGammaSF/2023post/electronID_highPt.json.gz b/analysis/data/EGammaSF/2023post/electronID_highPt.json.gz new file mode 100644 index 000000000..2ec4ae462 Binary files /dev/null and b/analysis/data/EGammaSF/2023post/electronID_highPt.json.gz differ diff --git a/analysis/data/EGammaSF/2023post/electronSS_EtDependent.json.gz b/analysis/data/EGammaSF/2023post/electronSS_EtDependent.json.gz index d128f5252..3e609e9f2 100644 Binary files a/analysis/data/EGammaSF/2023post/electronSS_EtDependent.json.gz and b/analysis/data/EGammaSF/2023post/electronSS_EtDependent.json.gz differ diff --git a/analysis/data/EGammaSF/2023post/photon.json.gz b/analysis/data/EGammaSF/2023post/photon.json.gz index 6c9a97dcd..6edcb3dbc 100644 Binary files a/analysis/data/EGammaSF/2023post/photon.json.gz and b/analysis/data/EGammaSF/2023post/photon.json.gz differ diff --git a/analysis/data/EGammaSF/2023post/photonID_highPt.json.gz b/analysis/data/EGammaSF/2023post/photonID_highPt.json.gz new file mode 100644 index 000000000..3df9d0d10 Binary files /dev/null and b/analysis/data/EGammaSF/2023post/photonID_highPt.json.gz differ diff --git a/analysis/data/EGammaSF/2023post/photonSS_EtDependent.json.gz b/analysis/data/EGammaSF/2023post/photonSS_EtDependent.json.gz index f18d5d8fd..b2a7cebb0 100644 Binary files a/analysis/data/EGammaSF/2023post/photonSS_EtDependent.json.gz and b/analysis/data/EGammaSF/2023post/photonSS_EtDependent.json.gz differ diff --git a/analysis/data/EGammaSF/2023pre/electron.json.gz b/analysis/data/EGammaSF/2023pre/electron.json.gz index 381e95c45..3732f60a8 100644 Binary files a/analysis/data/EGammaSF/2023pre/electron.json.gz and b/analysis/data/EGammaSF/2023pre/electron.json.gz differ diff --git a/analysis/data/EGammaSF/2023pre/electronID_highPt.json.gz b/analysis/data/EGammaSF/2023pre/electronID_highPt.json.gz new file mode 100644 index 000000000..8340e64a9 Binary files /dev/null and b/analysis/data/EGammaSF/2023pre/electronID_highPt.json.gz differ diff --git a/analysis/data/EGammaSF/2023pre/electronSS_EtDependent.json.gz b/analysis/data/EGammaSF/2023pre/electronSS_EtDependent.json.gz index 03b182d67..4336100ca 100644 Binary files a/analysis/data/EGammaSF/2023pre/electronSS_EtDependent.json.gz and b/analysis/data/EGammaSF/2023pre/electronSS_EtDependent.json.gz differ diff --git a/analysis/data/EGammaSF/2023pre/photon.json.gz b/analysis/data/EGammaSF/2023pre/photon.json.gz index 0dd95e31c..086b36a47 100644 Binary files a/analysis/data/EGammaSF/2023pre/photon.json.gz and b/analysis/data/EGammaSF/2023pre/photon.json.gz differ diff --git a/analysis/data/EGammaSF/2023pre/photonID_highPt.json.gz b/analysis/data/EGammaSF/2023pre/photonID_highPt.json.gz new file mode 100644 index 000000000..14b8472f1 Binary files /dev/null and b/analysis/data/EGammaSF/2023pre/photonID_highPt.json.gz differ diff --git a/analysis/data/EGammaSF/2023pre/photonSS_EtDependent.json.gz b/analysis/data/EGammaSF/2023pre/photonSS_EtDependent.json.gz index 2b9220c37..9049d6e3c 100644 Binary files a/analysis/data/EGammaSF/2023pre/photonSS_EtDependent.json.gz and b/analysis/data/EGammaSF/2023pre/photonSS_EtDependent.json.gz differ diff --git a/analysis/data/EGammaSF/2024/electron.json.gz b/analysis/data/EGammaSF/2024/electron.json.gz new file mode 100644 index 000000000..6ffa4a28c Binary files /dev/null and b/analysis/data/EGammaSF/2024/electron.json.gz differ diff --git a/analysis/data/EGammaSF/2024/electronHlt.json.gz b/analysis/data/EGammaSF/2024/electronHlt.json.gz new file mode 100644 index 000000000..bcdd8771d Binary files /dev/null and b/analysis/data/EGammaSF/2024/electronHlt.json.gz differ diff --git a/analysis/data/EGammaSF/2024/electronSS_EtDependent.json.gz b/analysis/data/EGammaSF/2024/electronSS_EtDependent.json.gz new file mode 100644 index 000000000..e31a0cccc Binary files /dev/null and b/analysis/data/EGammaSF/2024/electronSS_EtDependent.json.gz differ diff --git a/analysis/data/EGammaSF/2024/photon.json.gz b/analysis/data/EGammaSF/2024/photon.json.gz new file mode 100644 index 000000000..f42abf0ae Binary files /dev/null and b/analysis/data/EGammaSF/2024/photon.json.gz differ diff --git a/analysis/data/EGammaSF/2024/photonSS_EtDependent.json.gz b/analysis/data/EGammaSF/2024/photonSS_EtDependent.json.gz new file mode 100644 index 000000000..0019df8e2 Binary files /dev/null and b/analysis/data/EGammaSF/2024/photonSS_EtDependent.json.gz differ diff --git a/analysis/processors/stop_processor_v1.py b/analysis/processors/stop_processor_v1.py index de390ab02..7e7aa2dba 100644 --- a/analysis/processors/stop_processor_v1.py +++ b/analysis/processors/stop_processor_v1.py @@ -707,11 +707,12 @@ def process(self, events): #print(t_medium.pt) ### Jets - j = events.Jet + j = events.Jet # Events/Jet_* ### Appling JECs jec_corr = get_jec_correction(self._year, j.pt, j.eta, j.phi, j.rho, j.area, run, isData) j['pt'] = j.pt * jec_corr j['mass'] = j.mass * jec_corr + ### Appling JetID j['isgood'] = isGoodJet(j, self._year) j['T'] = ak.zip({ @@ -820,6 +821,7 @@ def process(self, events): selection.add('zero_e', n_e_veto == 0) selection.add('zero_m', n_m_loose == 0) selection.add('zero_t', n_t_medium == 0) + selection.add('one_veto_lepton', ((n_e_veto == 1) & (n_m_loose == 0)) | ((n_e_veto == 0) & (n_m_loose == 1))) selection.add('one_e', n_e_medium == 1) selection.add('one_m', n_m_medium == 1) selection.add('one_p', n_p_medium == 1) @@ -846,7 +848,16 @@ def process(self, events): 'met_250', 'puppi/calo', 'ht_300', 'opening_angles_preselection' ], - 'cat2_highDeltaM_mediumB': [ + 'cat2_LLCR': [ + 'lumimask', 'met_filters', + 'signal_trigger', + 'zero_trk_e', 'zero_trk_m', 'zero_trk_pi', + 'zero_t', 'two_j', + 'one_veto_lepton', + 'met_250', 'puppi/calo', + 'ht_300', 'opening_angles_preselection' + ], + 'cat3_highDeltaM_mediumB': [ 'lumimask', 'met_filters', 'signal_trigger', 'zero_trk_e', 'zero_trk_m', 'zero_trk_pi', @@ -854,7 +865,7 @@ def process(self, events): 'met_250', 'puppi/calo', 'ht_300', 'opening_angles_highDeltaM' ], - 'cat3_highDeltaM_tightB': [ + 'cat4_highDeltaM_tightB': [ 'lumimask', 'met_filters', 'signal_trigger', 'zero_trk_e', 'zero_trk_m', 'zero_trk_pi', @@ -862,7 +873,7 @@ def process(self, events): 'met_250', 'puppi/calo', 'ht_300', 'opening_angles_highDeltaM' ], - 'cat4_highDeltaM_looseB': [ + 'cat5_highDeltaM_looseB': [ 'lumimask', 'met_filters', 'signal_trigger', 'zero_trk_e', 'zero_trk_m', 'zero_trk_pi', diff --git a/analysis/utils/corrections.py b/analysis/utils/corrections.py index db02267b8..73109da89 100644 --- a/analysis/utils/corrections.py +++ b/analysis/utils/corrections.py @@ -57,6 +57,7 @@ def get_jec_correction(year, pt, eta, phi, rho, area, run, isData): evaluator = correctionlib.CorrectionSet.from_file('data/JMESF/'+year+'/jet_jerc.json.gz') counts = ak.num(pt) run, _ = ak.broadcast_arrays(run, pt) + rho, _ = ak.broadcast_arrays(rho, pt) pt, eta, phi, rho, area, run = ak.flatten(pt), ak.flatten(eta), ak.flatten(phi), ak.flatten(rho), ak.flatten(area), ak.flatten(run) if year == '2022pre': ## DATA Correction @@ -136,20 +137,21 @@ def get_fjec_correction(year, pt, eta, phi, rho, area, run, isData): evaluator = correctionlib.CorrectionSet.from_file('data/JMESF/'+year+'/fatJet_jerc.json.gz') counts = ak.num(pt) run, _ = ak.broadcast_arrays(run, pt) + rho, _ = ak.broadcast_arrays(rho, pt) pt, eta, phi, rho, area, run = ak.flatten(pt), ak.flatten(eta), ak.flatten(phi), ak.flatten(rho), ak.flatten(area), ak.flatten(run) if year == '2022pre': ## DATA Correction if isData: jec_names = { - 'L1FastJet' : "Summer22_22Sep2023_RunCD_V3_DATA_L2Relative_AK8PFPuppi", - 'L2Relative' : "Summer22_22Sep2023_RunCD_V3_DATA_L3Absolute_AK8PFPuppi", + 'L1FastJet' : "Summer22_22Sep2023_RunCD_V3_DATA_L1FastJet_AK8PFPuppi", + 'L2Relative' : "Summer22_22Sep2023_RunCD_V3_DATA_L2Relative_AK8PFPuppi", 'L3Absolute' : "Summer22_22Sep2023_RunCD_V3_DATA_L3Absolute_AK8PFPuppi", 'L2L3Residual' : "Summer22_22Sep2023_RunCD_V3_DATA_L2L3Residual_AK8PFPuppi" } # L1FastJet Correction corr_L1 = evaluator[jec_names['L1FastJet']].evaluate(area, eta, pt, rho) # L2Relative Correction - corr_L2 = evaluator[jec_names['L2Relative']].evaluate(eta, phi, pt) + corr_L2 = evaluator[jec_names['L2Relative']].evaluate(eta, pt) # L3Absolute Correction corr_L3 = evaluator[jec_names['L3Absolute']].evaluate(eta, pt) # L2L3Residual Correction @@ -165,7 +167,7 @@ def get_fjec_correction(year, pt, eta, phi, rho, area, run, isData): # L1FastJet Correction corr_L1 = evaluator[jec_names['L1FastJet']].evaluate(area, eta, pt, rho) # L2Relative Correction - corr_L2 = evaluator[jec_names['L2Relative']].evaluate(eta, phi, pt) + corr_L2 = evaluator[jec_names['L2Relative']].evaluate(eta, pt) # L3Absolute Correction corr_L3 = evaluator[jec_names['L3Absolute']].evaluate(eta, pt) corr = corr_L1 * corr_L2 * corr_L3