Merge pull request #279 from lsst/tickets/DM-36457

DM-36457: Use globs instead of regexes for dataset type patterns
lsst · Aug 9, 2024 · 5c219ae · 5c219ae
2 parents 713821a + cf652ff
commit 5c219ae
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/python/lsst/analysis/tools/tasks/gatherResourceUsage.py b/python/lsst/analysis/tools/tasks/gatherResourceUsage.py
@@ -40,7 +40,6 @@
 import numpy as np
 import pandas as pd
 from lsst.daf.butler import Butler, DatasetRef, DatasetType
-from lsst.daf.butler.utils import globToRegex
 from lsst.pex.config import Field, ListField
 from lsst.pipe.base import (
     Instrument,
@@ -573,10 +572,9 @@ def __init__(
         # build the pipeline.
         input_dataset_types: Any
         if not dataset_type_names:
-            base_dataset_type_filter = re.compile(r"\w+_metadata")
-            input_dataset_types = base_dataset_type_filter
+            input_dataset_types = "*_metadata"
         else:
-            input_dataset_types = [globToRegex(expr) for expr in dataset_type_names]
+            input_dataset_types = dataset_type_names
         pipeline_graph = PipelineGraph()
         metadata_refs: dict[str, set[DatasetRef]] = {}
         consolidate_config = ConsolidateResourceUsageConfig()