Skip to content

Commit

Permalink
Merge branch 'master' into plotting_variables
Browse files Browse the repository at this point in the history
  • Loading branch information
riga authored Jan 22, 2025
2 parents ed59559 + cdce14c commit 45c7eca
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 36 deletions.
65 changes: 51 additions & 14 deletions hbt/config/styles.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,60 @@ def setup_plot_styles(config: od.Config) -> None:
"whitespace_fraction": 0.31,
}

# common component configs
wide_legend = {
"ncols": 3, "borderpad": 0.7, "loc": "upper left", "fontsize": 16, "columnspacing": 1.6,
"labelspacing": 0.28, "entries_per_column": legend_entries_per_column,
# default component configs
gridspec = {
"height_ratios": [3, 0.9],
}
legend = {
"borderpad": 0, "borderaxespad": 1.2, "columnspacing": 1.8, "labelspacing": 0.28,
"fontsize": 16, "cf_line_breaks": True, "cf_short_labels": False,
}
ratio = {
"yloc": "center",
}
annotate = {
"fontsize": 18, "style": "italic", "xycoords": "axes fraction", "xy": (0.035, 0.955),
}

# wide legend
# - 3 columns, backgrounds in first 2 columns
# - shortened process labels
# - changed annotation (channel) position to fit right under legend
wide_legend = legend | {
"ncols": 3, "loc": "upper left", "cf_entries_per_column": legend_entries_per_column,
"cf_short_labels": True,
}
annotate_wide = annotate | {
"xy": (0.035, 0.765),
}

# wide extended legend, same as wide legend except
# - process labels are not shortened
# - annotation (channel) moved slightly down to fut under (now taller) legend
wide_ext_legend = wide_legend | {
"cf_short_labels": False,
}
annotate_wide_ext = annotate_wide | {
"xy": (0.035, 0.750),
}
rax = {"yloc": "center"}
annotate = {"fontsize": 16, "style": "italic"}
annotate_wide = {**annotate, "xycoords": "axes fraction", "xy": (0.035, 0.73)}

# construct named style configs
config.x.custom_style_config_groups = {
"default_legend": {
"rax_cfg": rax,
"default": (default_cfg := {
"gridspec_cfg": gridspec,
"rax_cfg": ratio,
"legend_cfg": legend,
"annotate_cfg": annotate,
},
"wide_legend": {
}),
"wide_legend": (wide_legend_cfg := {
**default_cfg,
"legend_cfg": wide_legend,
"rax_cfg": rax,
"annotate_cfg": annotate_wide,
}),
"wide_ext_legend": {
**wide_legend_cfg,
"legend_cfg": wide_ext_legend,
"annotate_cfg": annotate_wide_ext,
},
}

Expand Down Expand Up @@ -69,13 +104,15 @@ def stylize_processes(config: od.Config) -> None:
teal="#92dadd",
grey="#94a4a2",
brown="#a96b59",
green="#30c300",
dark_green="#269c00",
)

for kl in ["0", "1", "2p45", "5"]:
if (p := config.get_process(f"hh_ggf_hbb_htt_kl{kl}_kt1", default=None)):
p.color1 = cfg.x.colors.dark_blue
kappa_label = create_kappa_label(**{r"\lambda": kl, "t": "1"})
p.label = rf"$HH_{{ggf}} \rightarrow bb\tau\tau$ __SCALE__\n({kappa_label})"
p.label = rf"$HH_{{ggf}} \rightarrow bb\tau\tau$ __SCALE____SHORT____BREAK__({kappa_label})"

for kv, k2v, kl in [
("1", "1", "1"),
Expand All @@ -94,7 +131,7 @@ def stylize_processes(config: od.Config) -> None:
if (p := config.get_process(f"hh_vbf_hbb_htt_kv{kv}_k2v{k2v}_kl{kl}", default=None)):
p.color1 = cfg.x.colors.brown
kappa_label = create_kappa_label(**{"2V": k2v, r"\lambda": kl, "V": kv})
p.label = rf"$HH_{{vbf}} \rightarrow bb\tau\tau$ __SCALE__\n({kappa_label})"
p.label = rf"$HH_{{vbf}} \rightarrow bb\tau\tau$ __SCALE____SHORT____BREAK__({kappa_label})"

if (p := config.get_process("h", default=None)):
p.color1 = cfg.x.colors.teal
Expand Down
2 changes: 1 addition & 1 deletion law.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ crab_sandbox_name: CMSSW_14_2_1::arch=el9_amd64_gcc12
[analysis]

default_analysis: hbt.config.analysis_hbt.analysis_hbt
default_config: 22pre_v12
default_config: 22pre_v14
default_dataset: hh_ggf_hbb_htt_kl1_kt1_powheg

calibration_modules: columnflow.calibration.cms.{jets,met,tau}, hbt.calibration.{default,fake_triggers}
Expand Down
42 changes: 21 additions & 21 deletions law_fs.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cache_max_size: 50GB

[wlcg_fs_desy]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/$CF_CERN_USER/$CF_STORE_NAME
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/$CF_CERN_USER/$CF_STORE_NAME
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/$CF_CERN_USER/$CF_STORE_NAME
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/$CF_CERN_USER/$CF_STORE_NAME
base: &::webdav_base
base_filecopy: &::webdav_base
Expand All @@ -43,15 +43,15 @@ base: &::xrootd_base
#

[local_fs_dust_mrieger]
base: /nfs/dust/cms/user/riegerma/hh2bbtautau/hbt_store
base: /data/dust/user/riegerma/hh2bbtautau/hbt_store
default_dir_perm: 0o770
default_file_perm: 0o660
[local_fs_desy_mrieger]
base: /pnfs/desy.de/cms/tier2/store/user/mrieger/hbt_store
local_root_depth: 3
[wlcg_fs_desy_mrieger]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/mrieger/hbt_store
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/mrieger/hbt_store
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/mrieger/hbt_store
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/mrieger/hbt_store
base: &::xrootd_base
create_file_dir: True
Expand All @@ -62,15 +62,15 @@ cache_max_size: 50GB


[local_fs_dust_pkeicher]
base: /nfs/dust/cms/user/pkeicher/hh2bbtautau/hbt_store
base: /data/dust/user/pkeicher/hh2bbtautau/hbt_store
default_dir_perm: 0o770
default_file_perm: 0o660
[local_fs_desy_pkeicher]
base: /pnfs/desy.de/cms/tier2/store/user/pkeicher/hbt_store
local_root_depth: 3
[wlcg_fs_desy_pkeicher]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/pkeicher/hbt_store
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/pkeicher/hbt_store
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/pkeicher/hbt_store
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/pkeicher/hbt_store
base: &::xrootd_base
create_file_dir: True
Expand All @@ -81,15 +81,15 @@ cache_max_size: 50GB


[local_fs_dust_bwieders]
base: /nfs/dust/cms/user/wiedersb/hh2bbtautau/hbt_store
base: /data/dust/user/wiedersb/hh2bbtautau/hbt_store
default_dir_perm: 0o770
default_file_perm: 0o660
[local_fs_desy_bwieders]
base: /pnfs/desy.de/cms/tier2/store/user/bwieders/hbt_store
local_root_depth: 3
[wlcg_fs_desy_bwieders]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/bwieders/hbt_store
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/bwieders/hbt_store
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/bwieders/hbt_store
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/bwieders/hbt_store
base: &::xrootd_base
create_file_dir: True
Expand All @@ -100,15 +100,15 @@ cache_max_size: 50GB


[local_fs_dust_nprouvos]
base: /nfs/dust/cms/user/prouvost/hh2bbtautau/hbt_store
base: /data/dust/user/prouvost/hh2bbtautau/hbt_store
default_dir_perm: 0o770
default_file_perm: 0o660
[local_fs_desy_nprouvos]
base: /pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store
local_root_depth: 3
[wlcg_fs_desy_nprouvos]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store
base: &::webdav_base
create_file_dir: True
Expand All @@ -119,15 +119,15 @@ cache_max_size: 50GB


[local_fs_dust_aalvesan]
base: /nfs/dust/cms/user/alvesand/hh2bbtautau/hbt_store
base: /data/dust/user/alvesand/hh2bbtautau/hbt_store
default_dir_perm: 0o770
default_file_perm: 0o660
[local_fs_desy_aalvesan]
base: /pnfs/desy.de/cms/tier2/store/user/aalvesan/hbt_store
local_root_depth: 3
[wlcg_fs_desy_aalvesan]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/aalvesan/hbt_store
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/aalvesan/hbt_store
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/aalvesan/hbt_store
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/aalvesan/hbt_store
base: &::xrootd_base
create_file_dir: True
Expand All @@ -142,7 +142,7 @@ base: /pnfs/desy.de/cms/tier2/store/user/anhaddad/hbt_store
local_root_depth: 3
[wlcg_fs_desy_anhaddad]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/anhaddad/hbt_store
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/anhaddad/hbt_store
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/anhaddad/hbt_store
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/anhaddad/hbt_store
base: &::xrootd_base
create_file_dir: True
Expand All @@ -153,15 +153,15 @@ cache_max_size: 50GB


[local_fs_dust_roward]
base: /nfs/dust/cms/user/wardrobe/hh2bbtautau/hbt_store
base: /data/dust/user/wardrobe/hh2bbtautau/hbt_store
default_dir_perm: 0o770
default_file_perm: 0o660
[local_fs_desy_roward]
base: /pnfs/desy.de/cms/tier2/store/user/roward/hbt_store
local_root_depth: 3
[wlcg_fs_desy_roward]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/roward/hbt_store
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/roward/hbt_store
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/roward/hbt_store
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/roward/hbt_store
base: &::xrootd_base
create_file_dir: True
Expand All @@ -172,15 +172,15 @@ cache_max_size: 50GB


[local_fs_dust_pgadow]
base: /nfs/dust/cms/user/pgadow/hh2bbtautau/hbt_store
base: /data/dust/user/pgadow/hh2bbtautau/hbt_store
default_dir_perm: 0o770
default_file_perm: 0o660
[local_fs_desy_pgadow]
base: /pnfs/desy.de/cms/tier2/store/user/pgadow/hbt_store
local_root_depth: 3
[wlcg_fs_desy_pgadow]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/pgadow/hbt_store
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/pgadow/hbt_store
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/pgadow/hbt_store
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/pgadow/hbt_store
base: &::xrootd_base
create_file_dir: True
Expand All @@ -199,7 +199,7 @@ cache_max_size: 50GB
base: file:///pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v12/prod3
[wlcg_fs_run3_2022_preEE_nano_uhh_v12]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v12/prod3
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v12/prod3
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v12/prod3
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v12/prod3
base: &::xrootd_base
use_cache: $CF_WLCG_USE_CACHE
Expand All @@ -213,7 +213,7 @@ cache_global_lock: True
base: file:///pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v14/prod1
[wlcg_fs_run3_2022_preEE_nano_uhh_v14]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v14/prod1
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v14/prod1
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v14/prod1
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/nprouvos/nanogen_store/MergeNano/config_22pre_v14/prod1
base: &::xrootd_base
use_cache: $CF_WLCG_USE_CACHE
Expand All @@ -227,7 +227,7 @@ cache_global_lock: True
base: file:///pnfs/desy.de/cms/tier2/store/user/aalvesan/nanogen_store/MergeNano/config_22post_v14/prod1
[wlcg_fs_run3_2022_postEE_nano_uhh_v14]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/aalvesan/nanogen_store/MergeNano/config_22post_v14/prod1
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/aalvesan/nanogen_store/MergeNano/config_22post_v14/prod1
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/aalvesan/nanogen_store/MergeNano/config_22post_v14/prod1
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/aalvesan/nanogen_store/MergeNano/config_22post_v14/prod1
base: &::xrootd_base
use_cache: $CF_WLCG_USE_CACHE
Expand All @@ -241,7 +241,7 @@ cache_global_lock: True
base: file:///pnfs/desy.de/cms/tier2/store/user/bwieders/nanogen_store/MergeNano/config_23pre_v14/prod1
[wlcg_fs_run3_2023_preBPix_nano_uhh_v14]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/bwieders/nanogen_store/MergeNano/config_23pre_v14/prod1
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/bwieders/nanogen_store/MergeNano/config_23pre_v14/prod1
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/bwieders/nanogen_store/MergeNano/config_23pre_v14/prod1
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/bwieders/nanogen_store/MergeNano/config_23pre_v14/prod1
base: &::xrootd_base
use_cache: $CF_WLCG_USE_CACHE
Expand All @@ -255,7 +255,7 @@ cache_global_lock: True
base: file:///pnfs/desy.de/cms/tier2/store/user/roward/nanogen_store/MergeNano/config_23post_v14/prod1
[wlcg_fs_run3_2023_postBPix_nano_uhh_v14]
webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/roward/nanogen_store/MergeNano/config_23post_v14/prod1
gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/roward/nanogen_store/MergeNano/config_23post_v14/prod1
gsiftp_base: gsiftp://dcache-cms-gridftp.desy.de/pnfs/desy.de/cms/tier2/store/user/roward/nanogen_store/MergeNano/config_23post_v14/prod1
xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/roward/nanogen_store/MergeNano/config_23post_v14/prod1
base: &::xrootd_base
use_cache: $CF_WLCG_USE_CACHE
Expand Down

0 comments on commit 45c7eca

Please sign in to comment.