@@ -644,7 +644,7 @@ def _apply_JEC(self, objects, variables):
644644 if shift != "" and not self ._systematics :
645645 continue
646646 jecvariables = getJECVariables (
647- fatjetvars , objects ["candidatelep_p4" ], objects [" met" ], pt_shift = shift , met_shift = None
647+ fatjetvars , objects ["candidatelep_p4" ], objects ["met" ], pt_shift = shift , met_shift = None
648648 )
649649 variables = {** variables , ** jecvariables }
650650
@@ -747,14 +747,11 @@ def _apply_selections(self, events, trigger, metfilters, objects, variables):
747747
748748 def _store_genVars (self , dataset , events , objects , variables ):
749749
750- candidatefj = objects ["candidatefj" ]
751- FirstFatjet = objects ["FirstFatjet" ]
752-
753750 # store gen-level matching variables
754751 signal_mask = None
755752 if self .isMC :
756753 if self .isSignal :
757- genVars , signal_mask = match_H (events .GenPart , candidatefj , fatjet_pt = FirstFatjet )
754+ genVars , signal_mask = match_H (events .GenPart , objects [ " candidatefj" ] , fatjet_pt = objects [ " FirstFatjet" ] )
758755 # genVars = {**genVars, **match_H_alljets(events.GenPart, fatjets)}
759756 # add signal mask and modify sum of genweights to only consider those events that pass the mask
760757 self .add_selection (name = "Signal" , sel = signal_mask )
@@ -766,21 +763,21 @@ def _store_genVars(self, dataset, events, objects, variables):
766763 genVars ["STXS_cat" ] = events .HTXS .stage1_2_cat_pTjet30GeV
767764 genVars ["STXS_finecat" ] = events .HTXS .stage1_2_fine_cat_pTjet30GeV
768765 elif "HToTauTau" in dataset :
769- genVars , signal_mask = match_H (events .GenPart , candidatefj , dau_pdgid = 15 )
766+ genVars , signal_mask = match_H (events .GenPart , objects [ " candidatefj" ] , dau_pdgid = 15 )
770767 self .add_selection (name = "Signal" , sel = signal_mask )
771768 elif ("WJets" in dataset ) or ("ZJets" in dataset ) or ("DYJets" in dataset ):
772- genVars , _ = match_V (events .GenPart , candidatefj )
769+ genVars , _ = match_V (events .GenPart , objects [ " candidatefj" ] )
773770 if "LHE_HT" in events .fields :
774771 genVars ["LHE_HT" ] = events .LHE .HT
775772 if "LHE_Vpt" in events .fields :
776773 genVars ["LHE_Vpt" ] = events .LHE .Vpt
777774 elif "TT" in dataset :
778- genVars , _ = match_Top (events .GenPart , candidatefj )
775+ genVars , _ = match_Top (events .GenPart , objects [ " candidatefj" ] )
779776 else :
780777 genVars = {}
781778 # save gen jet mass (not msd)
782- genVars ["fj_genjetmass" ] = candidatefj .matched_gen .mass
783- genVars ["fj_genjetpt" ] = candidatefj .matched_gen .pt
779+ genVars ["fj_genjetmass" ] = objects [ " candidatefj" ] .matched_gen .mass
780+ genVars ["fj_genjetpt" ] = objects [ " candidatefj" ] .matched_gen .pt
784781 variables = {** variables , ** genVars }
785782
786783 return variables
0 commit comments