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.

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

update columnflow and cmsdb #18

Merged
merged 2 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 17 additions & 10 deletions hbt/config/configs_run2ul.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def add_config(
"tt_sl_powheg",
"tt_dl_powheg",
"tt_fh_powheg",
"ttz_llnunu_amcatnlo",
"ttz_llnunu_m10_amcatnlo",
"ttw_nlu_amcatnlo",
"ttw_qq_amcatnlo",
"ttzz_madgraph",
Expand All @@ -111,17 +111,20 @@ def add_config(
"st_tchannel_tbar_powheg",
"st_twchannel_t_powheg",
"st_twchannel_tbar_powheg",

# s-channel only available for run2_2017_nano_v9
"st_schannel_lep_amcatnlo",
"st_schannel_had_amcatnlo",
"dy_lep_pt50To100_amcatnlo",
"dy_lep_pt100To250_amcatnlo",
"dy_lep_pt250To400_amcatnlo",
"dy_lep_pt400To650_amcatnlo",

"dy_lep_pt50to100_amcatnlo",
"dy_lep_pt100to250_amcatnlo",
"dy_lep_pt250to400_amcatnlo",
"dy_lep_pt400to650_amcatnlo",
"dy_lep_pt650_amcatnlo",
"w_lnu_madgraph",
"ewk_wm_lnu_madgraph",
"ewk_w_lnu_madgraph",
"ewk_z_ll_madgraph",
"ewk_wm_lnu_m50_madgraph",
"ewk_w_lnu_m50_madgraph",
"ewk_z_ll_m50_madgraph",
"zz_pythia",
"wz_pythia",
"ww_pythia",
Expand All @@ -132,7 +135,7 @@ def add_config(
"h_ggf_tautau_powheg",
"h_vbf_tautau_powheg",
"zh_tautau_powheg",
"zh_bb_powheg",
"zh_llbb_powheg",
"wph_tautau_powheg",
"wmh_tautau_powheg",
"ggzh_llbb_powheg",
Expand Down Expand Up @@ -174,6 +177,7 @@ def add_config(
cfg.x.default_inference_model = "test_no_shifts"
cfg.x.default_categories = ("incl",)
cfg.x.default_variables = ("n_jet", "n_btag")
cfg.x.default_weight_producer = "all_weights"

# process groups for conveniently looping over certain processs
# (used in wrapper_factory and during plotting)
Expand Down Expand Up @@ -371,7 +375,7 @@ def add_config(
]

# name of the btag_sf correction set and jec uncertainties to propagate through
cfg.x.btag_sf = ("deepJet_shape", cfg.x.btag_sf_jec_sources)
cfg.x.btag_sf = ("deepJet_shape", cfg.x.btag_sf_jec_sources, "btagDeepFlavB")

# name of the deep tau tagger
# (used in the tec calibrator)
Expand Down Expand Up @@ -557,6 +561,9 @@ def add_config(
# external files
json_mirror = "/afs/cern.ch/work/m/mrieger/public/mirrors/jsonpog-integration-9ea86c4c"
cfg.x.external_files = DotDict.wrap({
# pileup weight corrections
"pu_sf": (f"{json_mirror}/POG/LUM/{year}{corr_postfix}_UL/puWeights.json.gz", "v1"),

# jet energy correction
"jet_jerc": (f"{json_mirror}/POG/JME/{year}{corr_postfix}_UL/jet_jerc.json.gz", "v1"),

Expand Down
2 changes: 1 addition & 1 deletion modules/cmsdb
Submodule cmsdb updated 49 files
+7 −16 .github/workflows/lint_and_test.yaml
+48 −0 cmsdb/campaigns/run2_2016_HIPM_nano_uhh_v12/__init__.py
+320 −0 cmsdb/campaigns/run2_2016_HIPM_nano_uhh_v12/data.py
+481 −0 cmsdb/campaigns/run2_2016_HIPM_nano_uhh_v12/ewk.py
+1,404 −0 cmsdb/campaigns/run2_2016_HIPM_nano_uhh_v12/hh2bbtautau.py
+106 −0 cmsdb/campaigns/run2_2016_HIPM_nano_uhh_v12/higgs.py
+126 −0 cmsdb/campaigns/run2_2016_HIPM_nano_uhh_v12/st.py
+258 −0 cmsdb/campaigns/run2_2016_HIPM_nano_uhh_v12/ttbar.py
+48 −0 cmsdb/campaigns/run2_2016_nano_uhh_v12/__init__.py
+208 −0 cmsdb/campaigns/run2_2016_nano_uhh_v12/data.py
+622 −0 cmsdb/campaigns/run2_2016_nano_uhh_v12/ewk.py
+1,278 −0 cmsdb/campaigns/run2_2016_nano_uhh_v12/hh2bbtautau.py
+162 −0 cmsdb/campaigns/run2_2016_nano_uhh_v12/higgs.py
+461 −0 cmsdb/campaigns/run2_2016_nano_uhh_v12/top.py
+39 −27 cmsdb/campaigns/run2_2017_nano_uhh_v11/ewk.py
+80 −0 cmsdb/campaigns/run2_2017_nano_v9/data.py
+37 −25 cmsdb/campaigns/run2_2017_nano_v9/ewk.py
+66 −44 cmsdb/campaigns/run2_2017_nano_v9/hh2bbww.py
+4 −4 cmsdb/campaigns/run2_2017_nano_v9/qcd.py
+43 −0 cmsdb/campaigns/run3_2022_postEE_nano_v12/__init__.py
+161 −0 cmsdb/campaigns/run3_2022_postEE_nano_v12/data.py
+105 −0 cmsdb/campaigns/run3_2022_postEE_nano_v12/ewk.py
+57 −0 cmsdb/campaigns/run3_2022_postEE_nano_v12/hh2bbww.py
+15 −0 cmsdb/campaigns/run3_2022_postEE_nano_v12/hhh4b2tau.py
+244 −0 cmsdb/campaigns/run3_2022_postEE_nano_v12/qcd.py
+1,026 −0 cmsdb/campaigns/run3_2022_postEE_nano_v12/top.py
+43 −0 cmsdb/campaigns/run3_2022_preEE_nano_v12/__init__.py
+176 −0 cmsdb/campaigns/run3_2022_preEE_nano_v12/data.py
+100 −0 cmsdb/campaigns/run3_2022_preEE_nano_v12/ewk.py
+56 −0 cmsdb/campaigns/run3_2022_preEE_nano_v12/hh2bbww.py
+15 −0 cmsdb/campaigns/run3_2022_preEE_nano_v12/hhh4b2tau.py
+250 −0 cmsdb/campaigns/run3_2022_preEE_nano_v12/qcd.py
+1,080 −0 cmsdb/campaigns/run3_2022_preEE_nano_v12/top.py
+48 −8 cmsdb/constants/__init__.py
+1 −0 cmsdb/processes/__init__.py
+7 −1 cmsdb/processes/data.py
+606 −107 cmsdb/processes/ewk.py
+120 −20 cmsdb/processes/hh2bbtautau.py
+1,033 −155 cmsdb/processes/hh2bbww.py
+39 −0 cmsdb/processes/hhh.py
+138 −25 cmsdb/processes/higgs.py
+86 −22 cmsdb/processes/qcd.py
+180 −87 cmsdb/processes/top.py
+13 −1 cmsdb/util.py
+187 −0 cmsdb/xsec_bsm_nodes.py
+115 −8 scripts/get_das_info.py
+13 −0 tests/__init__.py
+63 −0 tests/test_campaigns.py
+31 −0 tests/test_processes.py
2 changes: 1 addition & 1 deletion modules/columnflow
Submodule columnflow updated 146 files
Loading