Adapt to upstream cf changes.

uhh-cms · Nov 7, 2023 · dd718d5 · dd718d5
1 parent 78fb359
commit dd718d5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/hbt/calibration/tau.py b/hbt/calibration/tau.py
@@ -53,7 +53,7 @@ def tec(
     .. code-block:: python
 
         cfg.x.external_files = DotDict.wrap({
-            "tau_sf": "/afs/cern.ch/user/m/mrieger/public/mirrors/jsonpog-integration-f018adfb/POG/TAU/2017_UL/tau.json.gz",  # noqa
+            "tau_sf": "/afs/cern.ch/work/m/mrieger/public/mirrors/jsonpog-integration-9ea86c4c/POG/TAU/2017_UL/tau.json.gz",  # noqa
         })
 
     *get_tau_file* can be adapted in a subclass in case it is stored differently in the external

diff --git a/hbt/config/configs_run2ul.py b/hbt/config/configs_run2ul.py
@@ -554,7 +554,7 @@ def add_config(
     )
 
     # external files
-    json_mirror = "/afs/cern.ch/user/m/mrieger/public/mirrors/jsonpog-integration-dfd90038"
+    json_mirror = "/afs/cern.ch/work/m/mrieger/public/mirrors/jsonpog-integration-9ea86c4c"
     cfg.x.external_files = DotDict.wrap({
         # jet energy correction
         "jet_jerc": (f"{json_mirror}/POG/JME/{year}{corr_postfix}_UL/jet_jerc.json.gz", "v1"),
@@ -666,7 +666,7 @@ def add_config(
             "deterministic_seed", "pu_weight*", "btag_weight*", "cutflow.*",
         },
         "cf.MergeSelectionMasks": {
-            "normalization_weight", "process_id", "category_ids", "cutflow.*",
+            "cutflow.*",
         },
         "cf.UniteColumns": {
             "*",

diff --git a/hbt/production/tau.py b/hbt/production/tau.py
@@ -49,7 +49,7 @@ def tau_weights(self: Producer, events: ak.Array, **kwargs) -> ak.Array:
     .. code-block:: python
 
         cfg.x.external_files = DotDict.wrap({
-            "tau_sf": "/afs/cern.ch/user/m/mrieger/public/mirrors/jsonpog-integration-f018adfb/POG/TAU/2017_UL/tau.json.gz",  # noqa
+            "tau_sf": "/afs/cern.ch/work/m/mrieger/public/mirrors/jsonpog-integration-9ea86c4c/POG/TAU/2017_UL/tau.json.gz",  # noqa
         })
 
     *get_tau_file* can be adapted in a subclass in case it is stored differently in the external
@@ -230,7 +230,7 @@ def trigger_weights(self: Producer, events: ak.Array, **kwargs) -> ak.Array:
     .. code-block:: python
 
         cfg.x.external_files = DotDict.wrap({
-            "tau_sf": "/afs/cern.ch/user/m/mrieger/public/mirrors/jsonpog-integration-f018adfb/POG/TAU/2017_UL/tau.json.gz",  # noqa
+            "tau_sf": "/afs/cern.ch/work/m/mrieger/public/mirrors/jsonpog-integration-9ea86c4c/POG/TAU/2017_UL/tau.json.gz",  # noqa
         })
 
     *get_tau_file* can be adapted in a subclass in case it is stored differently in the external

diff --git a/modules/columnflow b/modules/columnflow
diff --git a/setup.sh b/setup.sh
@@ -127,8 +127,8 @@ setup_hbt() {
     # law setup
     #
 
-    export LAW_HOME="${HBT_BASE}/.law"
-    export LAW_CONFIG_FILE="${HBT_BASE}/law.cfg"
+    export LAW_HOME="${LAW_HOME:-${HBT_BASE}/.law}"
+    export LAW_CONFIG_FILE="${LAW_CONFIG_FILE:-${HBT_BASE}/law.cfg}"
 
     if which law &> /dev/null; then
         # source law's bash completion scipt
+2 −2		analysis_templates/cms_minimal/__cf_module_name__/config/analysis___cf_short_name_lc__.py
+2 −2		analysis_templates/cms_minimal/setup.sh
+4 −4		columnflow/calibration/cms/jets.py
+1 −1		columnflow/calibration/cms/met.py
+129 −98		columnflow/columnar_util.py
+3 −5		columnflow/plotting/plot_util.py
+1 −1		columnflow/production/cms/btag.py
+1 −1		columnflow/production/cms/electron.py
+1 −1		columnflow/production/cms/muon.py
+15 −10		columnflow/production/cms/pdf.py
+21 −6		columnflow/selection/__init__.py
+12 −8		columnflow/tasks/cms/base.py
+6 −3		columnflow/tasks/framework/base.py
+23 −11		columnflow/tasks/framework/mixins.py
+95 −43		columnflow/tasks/framework/remote.py
+3 −1		columnflow/tasks/framework/remote_bootstrap.sh
+3 −1		columnflow/tasks/selection.py
+10 −7		columnflow/util.py
+1 −1		modules/law
+2 −1		setup.py
+5 −6		setup.sh