Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ff mssm embed met fixes #379

Merged
merged 8 commits into from
Feb 4, 2021
Merged

Ff mssm embed met fixes #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6a73859
adding TauSpinner code for master students
Jan 25, 2021
7dc05c8
Merge branch 'FF_MSSM' of github.com:danielwinterbottom/ICHiggsTauTau…
Feb 4, 2021
817beda
latest updates with met fixes etc
Feb 4, 2021
b318c1e
adding first version of met corrections root file
Feb 4, 2021
5416121
removing some things left over from previous studies
Feb 4, 2021
1f089f2
cleaning things up
Feb 4, 2021
7992be0
fixing conflicts
Feb 4, 2021
ce0e21e
fixing a few more things and making sure it builds
Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Analysis/HiggsTauTauRun2/input/recoilfits/embed_fake_met_corrections.root
View file
Open in desktop
Binary file not shown.
12 changes: 7 additions & 5 deletions Analysis/HiggsTauTauRun2/interface/HTTCategories.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,17 @@ class HTTCategories : public ModuleBase {

double newmet_dphi_1_;
double newmet_dphi_2_;
double fake_met_dphi_1_;
double fake_met_dphi_2_;
double newmet_;
double fake_met_;
double gen_met_;

double fake_tau_met_dphi_1_;
double fake_tau_met_dphi_2_;
double fake_tau_met_;
double gen_tau_met_;

double qcd_frac_score_, w_frac_score_;
double w_frac_, qcd_frac_, ttbar_frac_;

Expand Down Expand Up @@ -1064,12 +1071,7 @@ class HTTCategories : public ModuleBase {
double gen_nu_eta_1_;
double gen_nu_eta_2_;

double met_noscale_;
double pf_met_;
double pf_met_fix_;
double met_fix_;
double pf_met_and_taus_;
double pf_met_and_taus_2_;

public:
HTTCategories(std::string const& name);
Expand Down
9 changes: 8 additions & 1 deletion Analysis/HiggsTauTauRun2/interface/HTTPairGenInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "PhysicsTools/FWLite/interface/TFileService.h"
#include "UserCode/ICHiggsTauTau/Analysis/Utilities/interface/HistoSet.h"
#include "UserCode/ICHiggsTauTau/Analysis/HiggsTauTauRun2/interface/HTTConfig.h"

#include "TGraph.h"

#include <string>

Expand All @@ -18,9 +18,16 @@ class HTTPairGenInfo : public ModuleBase {
CLASS_MEMBER(HTTPairGenInfo, fwlite::TFileService*, fs)
CLASS_MEMBER(HTTPairGenInfo, bool, write_plots)
CLASS_MEMBER(HTTPairGenInfo, bool, ngenjets)
CLASS_MEMBER(HTTPairGenInfo, bool, is_embedded)
CLASS_MEMBER(HTTPairGenInfo, ic::channel, channel)
CLASS_MEMBER(HTTPairGenInfo, ic::era, era)
std::vector<Dynamic2DHistoSet *> hists_;

TFile *embed_corr_;
TGraph *gr_met_corr_;
TGraph *gr_met_corr_up_;
TGraph *gr_met_corr_down_;

public:
HTTPairGenInfo(std::string const& name);
virtual ~HTTPairGenInfo();
Expand Down
45 changes: 21 additions & 24 deletions Analysis/HiggsTauTauRun2/scripts/HiggsTauTauPlot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,12 @@
# discrete x labels
discrete_x_axis = False
plot_var = options.var
discrete_x_labels = plot_var.split('[')[1].split(']')[0].split(',')
for i in discrete_x_labels:
if ">=" in i:
discrete_x_axis = True
discrete_x_labels=None
if '[' in plot_var and ']' in plot_var:
discrete_x_labels = plot_var.split('[')[1].split(']')[0].split(',')
for i in discrete_x_labels:
if ">=" in i:
discrete_x_axis = True

if discrete_x_axis:
run_bins = '['
Expand Down Expand Up @@ -1494,15 +1496,15 @@
data_samples = ['SingleMuonB','SingleMuonC','SingleMuonD','SingleMuonE','SingleMuonF','SingleMuonG','SingleMuonHv2','SingleMuonHv3']
if options.era == "legacy16":
data_samples = ['SingleMuonB','SingleMuonC','SingleMuonD','SingleMuonE','SingleMuonF','SingleMuonG','SingleMuonH']
if options.analysis=='mssmrun2': data_samples += ['TauB','TauC','TauD','TauE','TauF','TauG','TauH']
if options.analysis=='mssmrun2' and options.channel == 'mt': data_samples += ['TauB','TauC','TauD','TauE','TauF','TauG','TauH']
if options.channel == 'em':
data_samples = ['MuonEGB','MuonEGC','MuonEGD','MuonEGE','MuonEGF','MuonEGG','MuonEGHv2','MuonEGHv3']
if options.era == "legacy16": data_samples = ['MuonEGB','MuonEGC','MuonEGD','MuonEGE','MuonEGF','MuonEGG','MuonEGH']
if options.channel == 'et' or options.channel == 'zee':
data_samples = ['SingleElectronB','SingleElectronC','SingleElectronD','SingleElectronE','SingleElectronF','SingleElectronG','SingleElectronHv2','SingleElectronHv3']
if options.era == "legacy16":
data_samples = ['SingleElectronB','SingleElectronC','SingleElectronD','SingleElectronE','SingleElectronF','SingleElectronG','SingleElectronH']
if options.analysis=='mssmrun2': data_samples += ['TauB','TauC','TauD','TauE','TauF','TauG','TauH']
if options.analysis=='mssmrun2' and options.channel == 'et': data_samples += ['TauB','TauC','TauD','TauE','TauF','TauG','TauH']
if options.channel == 'tt':
data_samples = ['TauB','TauC','TauD','TauE','TauF','TauG','TauHv2','TauHv3']
if options.era == "legacy16": data_samples = ['TauB','TauC','TauD','TauE','TauF','TauG','TauH']
Expand Down Expand Up @@ -1588,12 +1590,13 @@

if options.channel in ['mt','zmm','mj']:
data_samples = ['SingleMuonB','SingleMuonC','SingleMuonD','SingleMuonE','SingleMuonF']
if options.analysis=='mssmrun2': data_samples += ['TauB','TauC','TauD','TauE','TauF']
if options.analysis=='mssmrun2' and options.channel == 'mt': data_samples += ['TauB','TauC','TauD','TauE','TauF']

if options.channel == 'em':
data_samples = ['MuonEGB','MuonEGC','MuonEGD','MuonEGE','MuonEGF']
if options.channel == 'et' or options.channel == 'zee':
data_samples = ['SingleElectronB','SingleElectronC','SingleElectronD','SingleElectronE','SingleElectronF']
if options.analysis=='mssmrun2': data_samples += ['TauB','TauC','TauD','TauE','TauF']
if options.analysis=='mssmrun2' and options.channel == 'et': data_samples += ['TauB','TauC','TauD','TauE','TauF']
if options.channel == 'tt':
data_samples = ['TauB','TauC','TauD','TauE','TauF']

Expand Down Expand Up @@ -1637,12 +1640,12 @@

if options.channel in ['mt','zmm','mj']:
data_samples = ['SingleMuonA','SingleMuonB','SingleMuonC','SingleMuonD']
if options.analysis=='mssmrun2': data_samples += ['TauA','TauB','TauC','TauD']
if options.analysis=='mssmrun2' and options.channel == 'mt': data_samples += ['TauA','TauB','TauC','TauD']
if options.channel == 'em':
data_samples = ['MuonEGA','MuonEGB','MuonEGC','MuonEGD']
if options.channel == 'et' or options.channel == 'zee':
data_samples = ['EGammaA','EGammaB','EGammaC','EGammaD']
if options.analysis=='mssmrun2': data_samples += ['TauA','TauB','TauC','TauD']
if options.analysis=='mssmrun2' and options.channel == 'et': data_samples += ['TauA','TauB','TauC','TauD']
if options.channel == 'tt':
data_samples = ['TauA','TauB','TauC','TauD']

Expand Down Expand Up @@ -2690,15 +2693,9 @@ def GetEmbeddedNode(ana, add_name='', samples=[], plot='', wt='', sel='', cat=''
if get_os: OSSS = 'os'
else: OSSS = '!os'
wt_ = wt
#wt_+='*((pt_2>100)*0.93*0.93/(idisoweight_1*idisoweight_2) + (pt_1>100&&pt_2<100)*0.93/idisoweight_1 + (pt_1<100))'
#if options.channel == 'et': wt_+='*(((tau_decay_mode_2==0)*0.975 + (tau_decay_mode_2==1)*0.975*1.051 + (tau_decay_mode_2==10)*0.927 + (tau_decay_mode_2==11)*0.926*1.051)*0.965600)/idisoweight_2'
#if options.channel == 'et': wt_+='*((pt_2>=40)*(0.983) + (pt_2<40)*(1.018))/idisoweight_2'
#if options.channel == 'mt': wt_+='*((pt_2>=40)*(0.983) + (pt_2<40)*(1.018))/idisoweight_2'
#'*0.98' # this is a tempoary fix for the different rates at which embedded taus pass the tight anti electron discriminator!
# if options.channel == 'et': wt_+='*((fabs(eta_1)<1.479) + (fabs(eta_1)>=1.479)/1.16)'#'*0.98' # this is a tempoary fix for the different rates at which embedded taus pass the tight anti electron discriminator!
# if options.channel == 'em' and options.era in ['cpsummer16','cpdecay16',"legacy16",'mvadm2016']: wt_+='*1.05'
# elif options.channel != 'em' and options.era in ['cpsummer16','cpdecay16',"legacy16",'mvadm2016']: wt_+='*1.05'
# elif options.era == 'cpsummer17': wt_+='*0.97'
if options.analysis=='mssmrun2':
if options.channel == 'tt': wt_+='*(pt_1/gen_match_1_pt<1.5&&pt_2/gen_match_2_pt<1.5)'
if options.channel in ['et','mt']: wt_+='*(pt_2/gen_match_2_pt<1.5)'
if options.channel == 'em':
#for em channel there are non-closures wrt data and MC which are corrected here with these additional correction factors
if options.era in ['cpsummer16','cpdecay16',"legacy16",'mvadm2016']: wt_+='*1.106'
Expand Down Expand Up @@ -4131,9 +4128,9 @@ def RunPlotting(ana, cat='',cat_data='', sel='', add_name='', wt='wt', do_data=T
residual_cat=cat+"&&"+add_fake_factor_selection
if 'EmbedZTT' not in samples_to_skip and options.embedding:
GenerateEmbedded(ana, add_name, embed_samples, plot, wt, sel, residual_cat, z_sels, not options.do_ss)
if do_data: GenerateZTT(ana, add_name, ztt_samples, plot, wt, sel, residual_cat, z_sels, not options.do_ss)
if do_data: GenerateZTT(ana, add_name, ztt_samples+top_samples+vv_samples+ewkz_samples, plot, wt, sel, residual_cat, z_sels, not options.do_ss)
if 'ZTT' not in samples_to_skip and not options.embedding:
GenerateZTT(ana, add_name, ztt_samples, plot, wt, sel, residual_cat, z_sels, not options.do_ss)
GenerateZTT(ana, add_name, ztt_samples, plot, wt, sel, residual_cat, z_sels, not options.do_ss)
if 'ZLL' not in samples_to_skip:
GenerateZLL(ana, add_name, zll_samples, plot, wt, sel, residual_cat, z_sels, not options.do_ss,doZL,False)
if 'TT' not in samples_to_skip:
Expand All @@ -4142,8 +4139,8 @@ def RunPlotting(ana, cat='',cat_data='', sel='', add_name='', wt='wt', do_data=T
GenerateVV(ana, add_name, vv_samples, plot, wt, sel, residual_cat, vv_sels, not options.do_ss, doVVT, doVVJ)
#if 'EWKZ' not in samples_to_skip and options.era in ['smsummer16','cpsummer16','cpdecay16',"legacy16",'tauid2016','cpsummer17','tauid2017','cp18','mvadm2016']:
#GenerateEWKZ(ana, add_name, ewkz_samples, plot, wt, sel, residual_cat, z_sels, not options.do_ss)
#if 'ggH_hww' not in samples_to_skip and 'qqH_hww' not in samples_to_skip and options.analysis == 'cpprod':
# GenerateHWW(ana, add_name, gghww_samples, qqhww_samples, plot, wt, sel, cat, not options.do_ss, True, True)
if 'ggH_hww' not in samples_to_skip and 'qqH_hww' not in samples_to_skip and options.analysis == 'cpprod':
GenerateHWW(ana, add_name, gghww_samples, qqhww_samples, plot, wt, sel, cat, not options.do_ss, True, True)
if 'W' not in samples_to_skip and options.channel=='tt' and options.analysis in ['cpprod','cpdecay','mssmrun2'] and 'VV' not in samples_to_skip and 'ZTT' not in samples_to_skip:
GenerateW(ana, 'fakes'+add_name, ztt_samples+vv_samples+wjets_samples+ewkz_samples+top_samples, data_samples, wgam_samples, plot, plot_unmodified, wt, sel+'&&gen_match_1!=6&&gen_match_2==6', cat, cat_data, 8, qcd_os_ss_ratio, not options.do_ss)
if options.channel in ['mt','et']:
Expand Down Expand Up @@ -4846,7 +4843,7 @@ def MergeXBins(hist):

outfile.Close()


if options.do_unrolling==0: exit(0)
if is_2d and not options.do_unrolling: exit(0) # add options for is_3d as well!
plot_file = ROOT.TFile(output_name, 'READ')

Expand Down
7 changes: 4 additions & 3 deletions Analysis/HiggsTauTauRun2/scripts/config_mssm_2016.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"file_prefix" : "root://gfe02.grid.hep.ph.ic.ac.uk:1097/store/user/guttley/Sep18_MC_102X_2016/",
"max_events": -1,
"timings": true,
"channels": ["tt","mt","et"],
//"channels": ["et"],
"channels": ["em","mt","et","tt"],
//"channels": ["tt"],
"sequences": {
"all": ["default"]
//,"scale_met_high,""scale_met_lo","res_met_high","res_met_lo"]
Expand Down Expand Up @@ -59,7 +59,8 @@
"do_ff_systematics": false,
"do_pdf_wts": false,
"do_qcd_scale_wts": false,
"output_folder" : "/vols/cms/gu18/Offline/output/MSSM/mssm_2016_v7/",
"output_folder" : "/vols/cms/dw515/Offline/output/MSSM/mssm_2016_v7_embed_met_fix/",
//"output_folder" : "output/",
"svfit_from_grid" : true,
"read_all_svfit_files" : true,
"svfit_folder" : "/vols/cms/gu18/Offline/output/SUSY/Jan24_2016_svfit_output/",
Expand Down
8 changes: 4 additions & 4 deletions Analysis/HiggsTauTauRun2/scripts/config_mssm_2017.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"file_prefix" : "root://gfe02.grid.hep.ph.ic.ac.uk:1097/store/user/dwinterb/Sep18_MC_102X_2017/",
"max_events": -1,
"timings": true,
"channels": ["tt","mt","et"],
//"channels": ["et"],
"channels": ["em","et","mt","tt"],
//"channels": ["tt"],
"sequences": {
"all": ["default"]
//,"scale_met_high,""scale_met_lo","res_met_high","res_met_lo"]
Expand Down Expand Up @@ -60,7 +60,7 @@
"do_pdf_wts": false,
"do_qcd_scale_wts": false,
//"output_folder" : "output/",
"output_folder" : "/vols/cms/gu18/Offline/output/MSSM/mssm_2017_v7/",
"output_folder" : "/vols/cms/dw515/Offline/output/MSSM/mssm_2017_v7_embed_met_fix/",
"svfit_from_grid" : true,
"read_all_svfit_files" : true,
"svfit_folder" : "/vols/cms/gu18/Offline/output/SUSY/Jan24_2017_svfit_output/",
Expand All @@ -71,7 +71,7 @@
"svfit_override" : "",
"mela_folder" : "/vols/cms/dw515/Offline/output/SM/Mar19_MELA/",
"mela_mode" : 0,
// "event_check_file":"checkfile.dat",
//"event_check_file":"checkfile.dat",
"pu_id_training": 4,
"bjet_regr_correction" : false,
"new_svfit_mode" : 0,
Expand Down
7 changes: 4 additions & 3 deletions Analysis/HiggsTauTauRun2/scripts/config_mssm_2018.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"file_prefix" : "root://gfe02.grid.hep.ph.ic.ac.uk:1097/store/user/guttley/Sep18_MC_102X_2018/",
"max_events": -1,
"timings": true,
"channels": ["tt","mt","et"],
//"channels": ["et"],
"channels": ["et","mt","em","tt"],
//"channels": ["tt"],
"sequences": {
"all": ["default"]
//,"scale_met_high,""scale_met_lo","res_met_high","res_met_lo"]
Expand Down Expand Up @@ -64,7 +64,8 @@
"do_ff_systematics": false,
"do_pdf_wts": false,
"do_qcd_scale_wts": false,
"output_folder" : "/vols/cms/gu18/Offline/output/MSSM/mssm_2018_v7/",
//"output_folder" : "output/",
"output_folder" : "/vols/cms/dw515/Offline/output/MSSM/mssm_2018_v7_embed_met_fix/",
"svfit_from_grid" : true,
"read_all_svfit_files" : true,
"svfit_folder" : "/vols/cms/gu18/Offline/output/SUSY/Jan24_2018_svfit_output/",
Expand Down
9 changes: 5 additions & 4 deletions Analysis/HiggsTauTauRun2/scripts/control_plots_ff_tt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os

#years = ['2016','2017']#,'2018']
years = ['2017']#,'2018']
years = ['2016']

variables = [
'met[0,10,20,30,40,50,60,70,80,90,100,120,140,200,400]',
Expand All @@ -10,10 +10,11 @@
'n_deepbjets(4,0,4)',
'pt_1[40,45,50,55,60,65,70,80,90,100,120,140,200,400]',
'pt_2[40,45,50,55,60,65,70,80,90,100,120,140,200,400]',
#'mt_1(20,0,200)',
#'mt_2(20,0,200)',
#'mt_lep(20,0,200)',
'mt_1(30,0,300)',
'mt_2(30,0,300)',
'mt_lep(30,0,300)',
'm_vis(50,0,500)',
'met_dphi_1(20,0,3.1415927)',
'mt_tot[80,100,120,140,160,180,200,250,300,350,400,500,700,3900]'
]

Expand Down
11 changes: 5 additions & 6 deletions Analysis/HiggsTauTauRun2/scripts/control_plots_tt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
#years = ['2017']

variables = [
'mt_tot[80,100,120,140,160,180,200,250,300,350,400,500,700,3900]',

'met[0,10,20,30,40,50,60,70,80,90,100,120,140,200,400]',
#'n_jets(4,0,4)',
#'n_prebjets(4,0,4)',
'n_deepbjets(4,0,4)',
'n_jets(4,0,4)',
'pt_1[40,45,50,55,60,65,70,80,90,100,120,140,200,400]',
'pt_2[40,45,50,55,60,65,70,80,90,100,120,140,200,400]',
'mt_1(30,0,300)',
Expand All @@ -17,8 +15,9 @@
'm_vis(50,0,500)',
'met_dphi_1(20,0,3.1415927)',
'met_dphi_2(20,0,3.1415927)',
'mt_tot[50,60,70,80,100,120,140,160,180,200,250,300,350,400,500,700,900,3900]',
'dphi(20,0,3.1415927)',
#'mt_tot[80,100,120,140,160,180,200,250,300,350,400,500,700,3900]'
'n_deepbjets(4,0,4)',
]


Expand All @@ -40,7 +39,7 @@
extra+=' --ratio_range=\"0.6,1.4\" '

# add systematic bands
extra += ' --do_custom_uncerts --add_stat_to_syst --syst_tau_trg_diff="trg_syst_*" --syst_tau_id_diff="id_syst_*" --do_ff_systs --syst_tquark="syst_ttbar_pt" --syst_embedding_tt="syst_embed_tt" --syst_tau_scale_grouped="tes_*group" '
extra += ' --do_custom_uncerts --add_stat_to_syst --syst_tau_trg_diff="trg_syst_*" --syst_tau_id_diff="id_syst_*" --do_ff_systs --syst_tquark="syst_ttbar_pt" --syst_embedding_tt="syst_embed_tt" ' #--syst_tau_scale_grouped="tes_*group" '

os.system('python scripts/HiggsTauTauPlot.py --cfg=scripts/plot_mssm_%(yp)s.cfg --method=17 --channel=tt --var=\"%(v_tt)s\" --outputfolder=mssm_control/ %(extra)s --embedding ' % vars())
os.system('python scripts/HiggsTauTauPlot.py --cfg=scripts/plot_mssm_%(yp)s.cfg --method=17 --channel=tt --var=\"%(v_tt)s\" --outputfolder=mssm_control/ %(extra)s --datacard=mc ' % vars())
Expand Down
2 changes: 1 addition & 1 deletion Analysis/HiggsTauTauRun2/scripts/hadd_legacy16_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def list_paths(path):
print sample_list

#channel = ['em','et','mt','tt','zee','zmm','wmnu','tpzee','tpzmm','tpmt','tpem']
channel = ['et','em','mt','tt']
channel = ['et','em','mt','tt','zmm']

with open("%(samplelist)s"%vars(),"r") as inf:
lines = inf.readlines()
Expand Down
2 changes: 1 addition & 1 deletion Analysis/HiggsTauTauRun2/scripts/hadd_smsummer17_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def list_paths(path):
sample_list = list(set(sample_list))

# channel = ['em','et','mt','tt','zee','zmm','wmnu','tpzee','tpzmm','tpmt','tpem']
channel = ['et','em','mt','tt']
channel = ['et','em','mt','tt','zmm']
with open("%(samplelist)s"%vars(),"r") as inf:
lines = inf.readlines()

Expand Down
7 changes: 2 additions & 5 deletions Analysis/HiggsTauTauRun2/scripts/hadd_smsummer18_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,10 @@ def list_paths(path):
'ttHToTauTau',
]


sample_list = list(set(sample_list))

channel = ['tt','mt','et','em']
channel = ['tt','mt','et','em','zmm']
with open("%(samplelist)s"%vars(),"r") as inf:
lines = inf.readlines()

Expand Down Expand Up @@ -391,7 +392,3 @@ def FindMissingFiles(outf, d, samp, chan, infiles):
if remove: file.write("\n%s" % rm_command)
file.write('\nEnd of job')
os.system('%(JOBSUBMIT)s %(JOB)s' % vars())
if not batch and remove:
# if all channels and systematics were hadded sucsessfully then remove the input files
for x in to_remove:
os.system(x)
2 changes: 1 addition & 1 deletion Analysis/HiggsTauTauRun2/scripts/htt_mssm_2016.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def getParaJobSubmit(N):



EMBEDFILELISTZMM="./filelists/Sep18_MC_102X_2016"
EMBEDFILELISTZMM="./filelists/Sep18_2016_MC_102X"

EMBEDFILELIST="./filelists/Sep18_2016_MC_102X"

Expand Down
4 changes: 3 additions & 1 deletion Analysis/HiggsTauTauRun2/scripts/htt_mssm_2018.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ def getParaJobSubmit(N):
output.close()
input.close()

n_channels=4
with open("config_for_python_channels.json") as config_file:
cfg = json.load(config_file)
n_channels=len(cfg["job"]["channels"])
Expand Down Expand Up @@ -360,7 +361,7 @@ def getParaJobSubmit(N):
nperjob = 300
if n_scales*n_channels>=28: nperjob = 150
if n_scales*n_channels>=56: nperjob=75
if 'MuTau' in sa: nperjob = int(math.ceil(float(nperjob)/5))
if 'MuTau' in sa: nperjob = int(math.ceil(float(nperjob)/10))
if 'ElTau' in sa and 'ElTauD' not in sa: nperjob = int(math.ceil(float(nperjob)/5))
# nperjob = int(math.ceil(float(nperjob)/max(1.,float(n_scales-8)*float(n_channels)/10.)))
nfiles = sum(1 for line in open('%(EMBEDFILELIST)s_%(sa)s.dat' % vars()))
Expand Down Expand Up @@ -449,6 +450,7 @@ def getParaJobSubmit(N):
if options.jetmetuncerts and 'default' in FLATJSONPATCH: nperjob = int(math.ceil(float(nperjob)/2))

#if 'TTTo' in sa: nperjob = int(math.ceil(float(nperjob)/2))
if 'TTTo' in sa: nperjob = int(math.ceil(float(nperjob)/2))
#nperjob = int(math.ceil(float(nperjob)/max(1.,float(n_scales)*float(n_channels)/10.)))
nfiles = sum(1 for line in open('%(FILELIST)s_%(sa)s.dat' % vars()))
for i in range (0,int(math.ceil(float(nfiles)/float(nperjob)))) :
Expand Down
2 changes: 1 addition & 1 deletion Analysis/HiggsTauTauRun2/scripts/htt_smsummer18.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def getParaJobSubmit(N):
'ZHiggs0PHToTauTau',
'ZHiggs0PHf05ph0ToTauTau',
'ZHiggs0PMToTauTau',
'VBFHToTauTau_M125_withDipoleRecoil'
'VBFHToTauTau_M125_withDipoleRecoil'
]


Expand Down
Loading