Merge pull request #55 from DBAnthony/wildcard-update

More rigorous value cols regex
FAST-HEP · Jun 22, 2021 · 5d23104 · 5d23104
2 parents 14c931a + d7a197e
commit 5d23104
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fast_plotter/postproc/__main__.py b/fast_plotter/postproc/__main__.py
@@ -20,7 +20,7 @@ def make_parser():
                         help="A yaml to configure the post-processing step")
     parser.add_argument("-o", "--outdir", default=".",
                         help="The name of the output directory")
-    parser.add_argument("-V", "--value-cols", default=r"(.*sumw2?|n)",
+    parser.add_argument("-V", "--value-cols", default=r"(.*sumw2?|/^n$/)",
                         help="A regular expression to control which columns are"
                         " identified as values and not bin labels")
     parser.add_argument("--help-stages", metavar="stage-name-regex", nargs="?", default=None, full_output=False,

diff --git a/fast_plotter/postproc/functions.py b/fast_plotter/postproc/functions.py
@@ -446,7 +446,7 @@ def normalise_group(df, groupby_dimensions, apply_if=None, use_column=None):
     return normed
 
 
-def open_many(file_list, value_columns=r"(.*sumw2?|n)", return_meta=True):
+def open_many(file_list, value_columns=r"(.*sumw2?|^n$)", return_meta=True):
     """ Open a list of dataframe files
     """
     dfs = []