From 768add193a9de091f782924b8e1744bfec3b58ca Mon Sep 17 00:00:00 2001 From: Jules Vandenbroeck Date: Thu, 12 Jun 2025 11:26:44 +0200 Subject: [PATCH 1/2] bug fixes to CreateCutflowHistograms --- columnflow/tasks/cutflow.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/columnflow/tasks/cutflow.py b/columnflow/tasks/cutflow.py index e18fbbdbe..c7dad472b 100644 --- a/columnflow/tasks/cutflow.py +++ b/columnflow/tasks/cutflow.py @@ -102,9 +102,6 @@ def __init__(self, *args, **kwargs): "there, 'raise' is assumed", ) - def create_branch_map(self): - # dummy branch map - return [None] def workflow_requires(self): reqs = super().workflow_requires() @@ -210,7 +207,7 @@ def expr(events): expressions[variable_inst.name] = expr # prepare columns to load - load_columns = read_columns | set(mandatory_coffea_columns) + load_columns = read_columns | {Route(c) for c in mandatory_coffea_columns} load_sel_columns = {Route("steps.*")} # prepare histograms From d68e0632eb499b33a97f4dd714a3cd2ef52be515 Mon Sep 17 00:00:00 2001 From: Jules Vandenbroeck Date: Thu, 12 Jun 2025 11:28:50 +0200 Subject: [PATCH 2/2] linting fix --- columnflow/tasks/cutflow.py | 1 - 1 file changed, 1 deletion(-) diff --git a/columnflow/tasks/cutflow.py b/columnflow/tasks/cutflow.py index c7dad472b..2337d6a57 100644 --- a/columnflow/tasks/cutflow.py +++ b/columnflow/tasks/cutflow.py @@ -102,7 +102,6 @@ def __init__(self, *args, **kwargs): "there, 'raise' is assumed", ) - def workflow_requires(self): reqs = super().workflow_requires() reqs["lfns"] = self.reqs.GetDatasetLFNs.req(self)