Update versions.

nprouvost · Jan 24, 2025 · 1b3b166 · 1b3b166
1 parent 3b567d5
commit 1b3b166
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 22 deletions.
diff --git a/hbt/config/configs_hbt.py b/hbt/config/configs_hbt.py
@@ -1174,10 +1174,10 @@ def add_external(name, value):
         if year == 2016:
             json_postfix = f"{'pre' if campaign.has_tag('preVFP') else 'post'}VFP"
         json_pog_era = f"{year}{json_postfix}_UL"
-        json_mirror = "/afs/cern.ch/user/m/mrieger/public/mirrors/jsonpog-integration-7439b936"
+        json_mirror = "/afs/cern.ch/user/m/mrieger/public/mirrors/jsonpog-integration-377439e8"
     elif run == 3:
         json_pog_era = f"{year}_Summer{year2}{campaign.x.postfix}"
-        json_mirror = "/afs/cern.ch/user/m/mrieger/public/mirrors/jsonpog-integration-7439b936"
+        json_mirror = "/afs/cern.ch/user/m/mrieger/public/mirrors/jsonpog-integration-377439e8"
     else:
         assert False
 

diff --git a/hbt/selection/lepton.py b/hbt/selection/lepton.py
@@ -353,6 +353,22 @@ def tau_selection(
     return base_mask, iso_mask
 
 
+@tau_selection.init
+def tau_selection_init(self: Selector) -> None:
+    # register tec shifts
+    self.shifts |= {
+        shift_inst.name
+        for shift_inst in self.config_inst.shifts
+        if shift_inst.has_tag("tec")
+    }
+
+    # Add columns for the right tau tagger
+    self.uses |= {
+        f"Tau.id{self.config_inst.x.tau_tagger}VS{tag}"
+        for tag in ("e", "mu", "jet")
+    }
+
+
 @selector(
     uses={"{Tau,TrigObj}.{pt,eta,phi}"},
     # shifts are declared dynamically below in tau_selection_init
@@ -422,22 +438,6 @@ def tau_trigger_matching(
     return matches
 
 
-@tau_selection.init
-def tau_selection_init(self: Selector) -> None:
-    # register tec shifts
-    self.shifts |= {
-        shift_inst.name
-        for shift_inst in self.config_inst.shifts
-        if shift_inst.has_tag("tec")
-    }
-
-    # Add columns for the right tau tagger
-    self.uses |= {
-        f"Tau.id{self.config_inst.x.tau_tagger}VS{tag}"
-        for tag in ("e", "mu", "jet")
-    }
-
-
 @selector(
     uses={
         electron_selection, electron_trigger_matching, muon_selection, muon_trigger_matching,

diff --git a/law_fs.cfg b/law_fs.cfg
@@ -16,7 +16,7 @@ base: /pnfs/desy.de/cms/tier2
 
 [wlcg_fs]
 base: &::wlcg_fs_desy::base
-base_mkdir_rec: &::wlcg_fs_desy::base
+base_mkdir_rec: &::wlcg_fs_desy::gsiftp_base
 create_file_dir: True
 use_cache: $CF_WLCG_USE_CACHE
 cache_root: $CF_WLCG_CACHE_ROOT

diff --git a/law_outputs.cfg b/law_outputs.cfg
@@ -89,6 +89,10 @@ cf.CreateSyncFile: local
 [versions]
 
 # for first plots (16.1.2025)
-22pre_v14__cf.CalibrateEvents: prod4
-22pre_v14__cf.{SelectEvents,MergeSelectionStats,ReduceEvents,MergeReductionStats,ProvideReducedEvents}: prod4
-22pre_v14__cf.ProduceColumns: prod4
+# 22pre_v14__cf.CalibrateEvents: prod4
+# 22pre_v14__cf.{SelectEvents,MergeSelectionStats,ReduceEvents,MergeReductionStats,ProvideReducedEvents}: prod4
+# 22pre_v14__cf.ProduceColumns: prod4
+# added eec and slightly adjusted selection
+22pre_v14__cf.CalibrateEvents: prod5
+22pre_v14__cf.{SelectEvents,MergeSelectionStats,ReduceEvents,MergeReductionStats,ProvideReducedEvents}: prod5
+22pre_v14__cf.ProduceColumns: prod5