Skip to content

Commit

Permalink
style: pre-commit fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed May 21, 2024
1 parent b978d74 commit 081cbfe
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/HH4b/postprocessing/CombineTemplates.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
"for rname, region in selection_regions.items():\n",
" plot_dir = main_plot_dir / year / \"wshifts\"\n",
" plot_dir.mkdir(exist_ok=True, parents=True)\n",
" #for wshift in list((jecs).keys()):\n",
" # for wshift in list((jecs).keys()):\n",
" for wshift in [\"trigger\"]:\n",
" if wshift in jecs:\n",
" # adding jshift-ed histograms into the same histogram\n",
Expand Down
17 changes: 14 additions & 3 deletions src/HH4b/postprocessing/CreateDatacard.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
)

add_bool_arg(parser, "only-sm", "Only add SM HH samples", default=False)
parser.add_argument("--sig-samples", default="hh4b", nargs='*', type=str, help="specify signals")
parser.add_argument("--sig-samples", default="hh4b", nargs="*", type=str, help="specify signals")

parser.add_argument(
"--nTF",
Expand Down Expand Up @@ -234,7 +234,12 @@
# ),
# TODO: separate into individual
"JES": Syst(name="CMS_scale_j", prior="shape", samples=sig_keys), # TODO: update to all_mc
"ttbarSF": Syst(name=f"{CMS_PARAMS_LABEL}_ttbar_sf", prior="shape", samples=["ttbar"], convert_shape_to_lnN=True),
"ttbarSF": Syst(
name=f"{CMS_PARAMS_LABEL}_ttbar_sf",
prior="shape",
samples=["ttbar"],
convert_shape_to_lnN=True,
),
# "trigger": Syst(name=f"{CMS_PARAMS_LABEL}_trigger", prior="shape", samples=all_mc), # TODO: fix
# "txbb": Syst(
# name=f"{CMS_PARAMS_LABEL}_PNetHbbScaleFactors_correlated",
Expand Down Expand Up @@ -484,7 +489,13 @@ def fill_regions(
logger = logging.getLogger(f"validate_shapes_{region}_{sample_name}_{skey}")

effect_up, effect_down = get_effect_updown(
values_nominal, values_up, values_down, mask, logger, args.epsilon, syst.convert_shape_to_lnN
values_nominal,
values_up,
values_down,
mask,
logger,
args.epsilon,
syst.convert_shape_to_lnN,
)
sample.setParamEffect(shape_systs_dict[skey], effect_up, effect_down)

Expand Down
6 changes: 4 additions & 2 deletions src/HH4b/postprocessing/datacardHelpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Syst:
# in case of uncorrelated unc., which years to split into
uncorr_years: list[str] = field(default_factory=lambda: all_years)
pass_only: bool = False # is it applied only in the pass regions
convert_shape_to_lnN: bool = False # take shape uncertainty and conert to lnN
convert_shape_to_lnN: bool = False # take shape uncertainty and conert to lnN

def __post_init__(self):
if isinstance(self.value, dict) and not (self.diff_regions or self.diff_samples):
Expand Down Expand Up @@ -181,7 +181,9 @@ def _shape_checks(values_up, values_down, values_nominal, effect_up, effect_down
logger.warning("Up and Down vary norm in the same direction")


def get_effect_updown(values_nominal, values_up, values_down, mask, logger, epsilon, convert_shape_to_lnN=False):
def get_effect_updown(
values_nominal, values_up, values_down, mask, logger, epsilon, convert_shape_to_lnN=False
):
if convert_shape_to_lnN:
effect_up = np.sum(values_up) / np.sum(values_nominal)
effect_down = np.sum(values_down) / np.sum(values_nominal)
Expand Down

0 comments on commit 081cbfe

Please sign in to comment.