From 99f4ce0a32c784fa6f826a47a40a4987a023f57e Mon Sep 17 00:00:00 2001
From: "Marcel R." <github.riga@icloud.com>
Date: Wed, 27 Nov 2024 14:23:54 +0100
Subject: [PATCH] Use deterministic jer in default calibration.

---
 hbt/calibration/default.py | 9 ++++++---
 modules/columnflow         | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hbt/calibration/default.py b/hbt/calibration/default.py
index 98ed60f1..6f1b5678 100644
--- a/hbt/calibration/default.py
+++ b/hbt/calibration/default.py
@@ -20,14 +20,17 @@
 # derive calibrators to add settings
 jec_full = jec.derive("jec_full", cls_dict={"mc_only": True, "nominal_only": True})
 
+# version of jer that uses the first random number from deterministic_seeds
+deterministic_jer = jer.derive("deterministic_jer", cls_dict={"deterministic_seed_index": 0})
+
 
 @calibrator(
     uses={
-        mc_weight, jec_nominal, jec_full, jer, tec_nominal, tec, deterministic_seeds,
+        mc_weight, deterministic_seeds, jec_nominal, jec_full, deterministic_jer, tec_nominal, tec,
         IF_RUN_2(met_phi),
     },
     produces={
-        mc_weight, jec_nominal, jec_full, jer, tec_nominal, tec, deterministic_seeds,
+        mc_weight, deterministic_seeds, jec_nominal, jec_full, deterministic_jer, tec_nominal, tec,
         IF_RUN_2(met_phi),
     },
 )
@@ -40,7 +43,7 @@ def default(self: Calibrator, events: ak.Array, **kwargs) -> ak.Array:
         events = self[jec_nominal](events, **kwargs)
     else:
         events = self[jec_full](events, **kwargs)
-        events = self[jer](events, **kwargs)
+        events = self[deterministic_jer](events, **kwargs)
 
     if self.config_inst.campaign.x.run == 2:
         events = self[met_phi](events, **kwargs)
diff --git a/modules/columnflow b/modules/columnflow
index 545a918d..ea1e234b 160000
--- a/modules/columnflow
+++ b/modules/columnflow
@@ -1 +1 @@
-Subproject commit 545a918d94aa3ddb6c67f558d875023ec8c2308b
+Subproject commit ea1e234b5adf0bb0ba3d9c889bae71e7f3fa9ded