Adapt to new cf.

uhh-cms · Dec 6, 2024 · 82247f4 · 82247f4
1 parent 032f6fe
commit 82247f4
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 64 deletions.
diff --git a/hbt/config/configs_hbt.py b/hbt/config/configs_hbt.py
@@ -546,72 +546,76 @@ def if_era(
         assert False
 
     cfg.x.jec = DotDict.wrap({
-        "campaign": jec_campaign,
-        "version": jec_version,
-        "jet_type": jet_type,
-        "levels": ["L1FastJet", "L2Relative", "L2L3Residual", "L3Absolute"],
-        "levels_for_type1_met": ["L1FastJet"],
-        "uncertainty_sources": [
-            # "AbsoluteStat",
-            # "AbsoluteScale",
-            # "AbsoluteSample",
-            # "AbsoluteFlavMap",
-            # "AbsoluteMPFBias",
-            # "Fragmentation",
-            # "SinglePionECAL",
-            # "SinglePionHCAL",
-            # "FlavorQCD",
-            # "TimePtEta",
-            # "RelativeJEREC1",
-            # "RelativeJEREC2",
-            # "RelativeJERHF",
-            # "RelativePtBB",
-            # "RelativePtEC1",
-            # "RelativePtEC2",
-            # "RelativePtHF",
-            # "RelativeBal",
-            # "RelativeSample",
-            # "RelativeFSR",
-            # "RelativeStatFSR",
-            # "RelativeStatEC",
-            # "RelativeStatHF",
-            # "PileUpDataMC",
-            # "PileUpPtRef",
-            # "PileUpPtBB",
-            # "PileUpPtEC1",
-            # "PileUpPtEC2",
-            # "PileUpPtHF",
-            # "PileUpMuZero",
-            # "PileUpEnvelope",
-            # "SubTotalPileUp",
-            # "SubTotalRelative",
-            # "SubTotalPt",
-            # "SubTotalScale",
-            # "SubTotalAbsolute",
-            # "SubTotalMC",
-            "Total",
-            # "TotalNoFlavor",
-            # "TotalNoTime",
-            # "TotalNoFlavorNoTime",
-            # "FlavorZJet",
-            # "FlavorPhotonJet",
-            # "FlavorPureGluon",
-            # "FlavorPureQuark",
-            # "FlavorPureCharm",
-            # "FlavorPureBottom",
-            "CorrelationGroupMPFInSitu",
-            "CorrelationGroupIntercalibration",
-            "CorrelationGroupbJES",
-            "CorrelationGroupFlavor",
-            "CorrelationGroupUncorrelated",
-        ],
+        "Jet": {
+            "campaign": jec_campaign,
+            "version": jec_version,
+            "jet_type": jet_type,
+            "levels": ["L1FastJet", "L2Relative", "L2L3Residual", "L3Absolute"],
+            "levels_for_type1_met": ["L1FastJet"],
+            "uncertainty_sources": [
+                # "AbsoluteStat",
+                # "AbsoluteScale",
+                # "AbsoluteSample",
+                # "AbsoluteFlavMap",
+                # "AbsoluteMPFBias",
+                # "Fragmentation",
+                # "SinglePionECAL",
+                # "SinglePionHCAL",
+                # "FlavorQCD",
+                # "TimePtEta",
+                # "RelativeJEREC1",
+                # "RelativeJEREC2",
+                # "RelativeJERHF",
+                # "RelativePtBB",
+                # "RelativePtEC1",
+                # "RelativePtEC2",
+                # "RelativePtHF",
+                # "RelativeBal",
+                # "RelativeSample",
+                # "RelativeFSR",
+                # "RelativeStatFSR",
+                # "RelativeStatEC",
+                # "RelativeStatHF",
+                # "PileUpDataMC",
+                # "PileUpPtRef",
+                # "PileUpPtBB",
+                # "PileUpPtEC1",
+                # "PileUpPtEC2",
+                # "PileUpPtHF",
+                # "PileUpMuZero",
+                # "PileUpEnvelope",
+                # "SubTotalPileUp",
+                # "SubTotalRelative",
+                # "SubTotalPt",
+                # "SubTotalScale",
+                # "SubTotalAbsolute",
+                # "SubTotalMC",
+                "Total",
+                # "TotalNoFlavor",
+                # "TotalNoTime",
+                # "TotalNoFlavorNoTime",
+                # "FlavorZJet",
+                # "FlavorPhotonJet",
+                # "FlavorPureGluon",
+                # "FlavorPureQuark",
+                # "FlavorPureCharm",
+                # "FlavorPureBottom",
+                "CorrelationGroupMPFInSitu",
+                "CorrelationGroupIntercalibration",
+                "CorrelationGroupbJES",
+                "CorrelationGroupFlavor",
+                "CorrelationGroupUncorrelated",
+            ],
+        },
     })
 
     # JER
     cfg.x.jer = DotDict.wrap({
-        "campaign": jer_campaign,
-        "version": jer_version,
-        "jet_type": jet_type,
+        "Jet": {
+            "campaign": jer_campaign,
+            "version": jer_version,
+            "jet_type": jet_type,
+        },
     })
 
     ################################################################################################
@@ -850,7 +854,7 @@ def if_era(
     cfg.add_shift(name="top_pt_down", id=10, type="shape")
     add_shift_aliases(cfg, "top_pt", {"top_pt_weight": "top_pt_weight_{direction}"})
 
-    for jec_source in cfg.x.jec.uncertainty_sources:
+    for jec_source in cfg.x.jec.Jet.uncertainty_sources:
         idx = all_jec_sources.index(jec_source)
         cfg.add_shift(
             name=f"jec_{jec_source}_up",

diff --git a/modules/columnflow b/modules/columnflow
+4 −2		analysis_templates/cms_minimal/__cf_module_name__/config/analysis___cf_short_name_lc__.py
+8 −0		analysis_templates/cms_minimal/__cf_module_name__/selection/example.py
+319 −135		columnflow/calibration/cms/jets.py
+1 −1		columnflow/columnar_util.py
+102 −0		columnflow/hist_util.py
+8 −4		columnflow/plotting/plot_util.py
+76 −58		columnflow/production/cms/seeds.py
+11 −16		columnflow/tasks/cutflow.py
+13 −2		columnflow/tasks/framework/base.py
+3 −0		columnflow/tasks/framework/mixins.py
+8 −22		columnflow/tasks/histograms.py
+5 −3		docs/api/index.rst
+9 −0		docs/api/weights/all_weights.rst
+9 −0		docs/api/weights/empty.rst
+14 −0		docs/api/weights/index.rst
+3 −1		docs/user_guide/building_blocks/config_objects.md
+1 −0		docs/user_guide/index.rst
+203 −0		docs/user_guide/shifts.md
+6 −0		tests/run_tests
+103 −0		tests/test_hist_util.py