@@ -211,6 +211,7 @@ def __init__(self, case, datap, run_param, mcordata, p_maxfiles,
211211 self .p_usejetptbinned_deff = \
212212 datap ["analysis" ][self .typean ].get ("usejetptbinned_deff" , False )
213213 print ("use jet binned efficiency" , self .p_usejetptbinned_deff )
214+
214215 # pylint: disable=too-many-branches
215216 def process_histomass_single (self , index ):
216217 myfile = TFile .Open (self .l_histomass [index ], "recreate" )
@@ -345,6 +346,8 @@ def process_efficiency_single(self, index):
345346 self .lpt_finbinmin [ipt ], self .lpt_finbinmax [ipt ])
346347 df_mc_gen = seldf_singlevar (df_mc_gen , self .v_var2_binning , \
347348 self .lvar2_binmin_gen [ibin2 ], self .lvar2_binmax_gen [ibin2 ])
349+ df_mc_gen ["z" ] = z_calc (df_mc_gen .pt_jet , df_mc_gen .phi_jet , df_mc_gen .eta_jet ,
350+ df_mc_gen .pt_cand , df_mc_gen .phi_cand , df_mc_gen .eta_cand )
348351 df_mc_gen = seldf_singlevar (df_mc_gen , self .v_varshape_binning , \
349352 self .lvarshape_binmin_gen [ibinshape ], self .lvarshape_binmax_gen [ibinshape ])
350353
@@ -533,6 +536,10 @@ def process_efficiency_single(self, index):
533536 df_mc_reco ["z" ] = z_calc (df_mc_reco .pt_jet , df_mc_reco .phi_jet , df_mc_reco .eta_jet ,
534537 df_mc_reco .pt_cand , df_mc_reco .phi_cand , df_mc_reco .eta_cand )
535538
539+ df_mc_reco ["z_gen" ] = z_gen_calc (df_mc_reco .pt_gen_jet , df_mc_reco .phi_gen_jet ,
540+ df_mc_reco .eta_gen_jet , df_mc_reco .pt_gen_cand ,
541+ df_mc_reco .delta_phi_gen_jet , df_mc_reco .delta_eta_gen_jet )
542+
536543 # restrict gen shape range
537544 df_reco_no_overflow = seldf_singlevar (df_mc_reco , \
538545 self .v_varshape_binning_gen , self .lvarshape_binmin_gen [0 ], self .lvarshape_binmax_gen [- 1 ])
0 commit comments