Merge pull request #75 from uhh-cms/dev

v0.4

Author: apaasch

hbw/analysis/create_analysis.py

@@ -60,25 +60,67 @@ def create_hbw_analysis(
     #
 
     from hbw.config.config_run2 import add_config
+
     import cmsdb.campaigns.run2_2017_nano_v9
+    import cmsdb.campaigns.run3_2022_preEE_nano_v12
+    import cmsdb.campaigns.run3_2022_postEE_nano_v12
 
     campaign_run2_2017_nano_v9 = cmsdb.campaigns.run2_2017_nano_v9.campaign_run2_2017_nano_v9
+    campaign_run3_2022_preEE_nano_v12 = cmsdb.campaigns.run3_2022_preEE_nano_v12.campaign_run3_2022_preEE_nano_v12
+    campaign_run3_2022_preEE_nano_v12.x.EE = "pre"
+
+    campaign_run3_2022_postEE_nano_v12 = cmsdb.campaigns.run3_2022_postEE_nano_v12.campaign_run3_2022_postEE_nano_v12
+    campaign_run3_2022_postEE_nano_v12.x.EE = "post"
 
-    # default config
+    # 2017
     c17 = add_config(  # noqa
         analysis_inst,
         campaign_run2_2017_nano_v9.copy(),
         config_name="c17",
-        config_id=2,
+        config_id=1700,
+        add_dataset_extensions=False,
     )
-
-    # config with limited number of files
     l17 = add_config(  # noqa
         analysis_inst,
         campaign_run2_2017_nano_v9.copy(),
         config_name="l17",
-        config_id=12,
+        config_id=1701,
+        limit_dataset_files=2,
+        add_dataset_extensions=False,
+    )
+
+    # 2022 preEE
+    c22pre = add_config(  # noqa
+        analysis_inst,
+        campaign_run3_2022_preEE_nano_v12.copy(),
+        config_name="c22pre",
+        config_id=2200,
+        add_dataset_extensions=False,
+    )
+    l22pre = add_config(  # noqa
+        analysis_inst,
+        campaign_run3_2022_preEE_nano_v12.copy(),
+        config_name="l22pre",
+        config_id=2201,
+        limit_dataset_files=2,
+        add_dataset_extensions=False,
+    )
+
+    # 2022 postEE
+    c22post = add_config(  # noqa
+        analysis_inst,
+        campaign_run3_2022_postEE_nano_v12.copy(),
+        config_name="c22post",
+        config_id=2210,
+        add_dataset_extensions=False,
+    )
+    l22post = add_config(  # noqa
+        analysis_inst,
+        campaign_run3_2022_postEE_nano_v12.copy(),
+        config_name="l22post",
+        config_id=2211,
         limit_dataset_files=2,
+        add_dataset_extensions=False,
     )
 
     return analysis_inst

hbw/calibration/default.py

@@ -51,15 +51,16 @@ def base_init(self: Calibrator) -> None:
     if self.bjet_regression:
         self.calibrators.append(bjet_regression)
 
-    if self.dataset_inst.is_mc:
-        # TODO: we might need to modify jer when using bjet calibration
+    # run JER only on MC
+    # and not for 2022 (TODO: update as soon as JER is done for Summer22)
+    if self.dataset_inst.is_mc and not self.config_inst.campaign.x.year == 2022:
         self.calibrators.append(jer)
 
     self.uses |= set(self.calibrators)
     self.produces |= set(self.calibrators)
 
 
-default = base.derive("default", cls_dict=dict(skip_jecunc=True, bjet_regression=False))
+default = base.derive("default", cls_dict=dict(skip_jecunc=False, bjet_regression=False))
 skip_jecunc = base.derive("skip_jecunc", cls_dict=dict(skip_jecunc=True, bjet_regression=False))
 with_b_reg = base.derive("with_b_reg", cls_dict=dict(skip_jecunc=True, bjet_regression=True))
 full = base.derive("full", cls_dict=dict(skip_jecunc=False, bjet_regression=True))

hbw/calibration/jet.py

@@ -8,7 +8,7 @@
 
 import functools
 
-from columnflow.util import maybe_import, test_float
+from columnflow.util import maybe_import, try_float
 from columnflow.columnar_util import set_ak_column
 from columnflow.calibration.cms.jets import jec
 from columnflow.calibration import calibrator, Calibrator
@@ -60,7 +60,7 @@ def bjet_regression(
     default_jet_mask = (events.Jet.pt > 20)
     if self.btag_wp:
         btag_wp = self.btag_wp
-        if not test_float(self.btag_wp):
+        if not try_float(self.btag_wp):
             btag_wp = self.config_inst.x.btag_working_points.deepjet[self.btag_wp]
         default_jet_mask = default_jet_mask & (events.Jet.btagDeepFlavB > btag_wp)