LbAPLocal 0.12.0__tar.gz → 0.12.2__tar.gz

{lbaplocal-0.12.0 → lbaplocal-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LbAPLocal
-Version: 0.12.0
+Version: 0.12.2
 Summary: Tool to locally run tests for AnalysisProductions
 Author: LHCb
 Project-URL: Homepage, https://gitlab.cern.ch/lhcb-dpa/analysis-productions/lbaplocal

{lbaplocal-0.12.0 → lbaplocal-0.12.2}/src/LbAPLocal/cli/generate.py

@@ -398,7 +398,7 @@ def generate_options(lines: list[str]) -> str:
     ##############################
 
 
-    def add_mc_variables(particles, line):
+    def add_mc_variables(particles, line) -> FunctorCollection:
         \"\"\"Truth matching and background category, added for simulation only.\"\"\"
         mctruth = MCTruthAndBkgCat(particles, name=f"MCTruthAndBkgCat_{line}")
         return FunctorCollection(
@@ -414,7 +414,7 @@ def generate_options(lines: list[str]) -> str:
         )
 
 
-    def add_variables(particles, line, simulation):
+    def add_variables(particles, line, simulation) -> dict[str, FunctorCollection]:
         \"\"\"Variables to tuple, keyed by field (\"ALL\" covers every field).\"\"\"
         variables = {}
         variables["ALL"] = FC.Kinematics()
@@ -425,7 +425,7 @@ def generate_options(lines: list[str]) -> str:
         return variables
 
 
-    def add_event_variables():
+    def add_event_variables() -> FunctorCollection:
         \"\"\"Event-level information tupled once per event.\"\"\"
         event_variables = FunctorCollection()
         event_variables += FC.EventInfo()
@@ -433,35 +433,41 @@ def generate_options(lines: list[str]) -> str:
         return event_variables
 
 
+    def configure_funtuple(line: str, input_process: str, simulation: bool):
+        particles = get_particles(line=line, input_process=input_process)
+
+        descriptor = DESCRIPTORS.get(line)
+        if not descriptor:
+            raise RuntimeError(f"Descriptor template not filled for line: {line}")
+        fields = descriptor_fields(descriptor)
+
+        variables = add_variables(particles, line, simulation)
+        event_variables = add_event_variables()
+
+        funtuple = Funtuple(
+            name=f"Tuple_{line}",
+            tuple_name="DecayTree",
+            fields=fields,
+            variables=variables,
+            event_variables=event_variables,
+            inputs=particles,
+        )
+        line_filter = create_lines_filter(name=f"PreFilter_{line}", lines=[line])
+        return [line_filter, funtuple]
+
+
     def main(options: Options, *raw_args):
         parser = argparse.ArgumentParser()
         parser.add_argument("--line", dest="lines", action="append")
         parser.add_argument("--skip-line", dest="skip", action="append", default=[])
         args = parser.parse_args(raw_args)
+
         lines = [line for line in (args.lines or DEFAULT_LINES) if line not in args.skip]
 
-        tuples = {}
-        for line in lines:
-            particles = get_particles(line=line, input_process=options.input_process)
-
-            descriptor = DESCRIPTORS.get(line)
-            if not descriptor:
-                raise RuntimeError(f"Descriptor template not filled for line: {line}")
-            fields = descriptor_fields(descriptor)
-
-            variables = add_variables(particles, line, options.simulation)
-            event_variables = add_event_variables()
-
-            funtuple = Funtuple(
-                name=f"Tuple_{line}",
-                tuple_name="DecayTree",
-                fields=fields,
-                variables=variables,
-                event_variables=event_variables,
-                inputs=particles,
-            )
-            line_filter = create_lines_filter(name=f"PreFilter_{line}", lines=[line])
-            tuples[line] = [line_filter, funtuple]
+        tuples = {
+            line: configure_funtuple(line, options.input_process, options.simulation)
+            for line in lines
+        }
 
         return make_config(options, tuples)
     """))

{lbaplocal-0.12.0 → lbaplocal-0.12.2}/src/LbAPLocal/cli/mc_lookup.py

@@ -48,8 +48,16 @@ REQUIRED_COLUMNS = {
 }
 
 # Analysis-consumable file types: the post-trigger / post-sprucing DSTs a
-# DaVinci analysis production reads. Everything else is intermediate.
-ANALYSIS_FILETYPES = {"HLT2.DST", "SPRUCE.DST"}
+# DaVinci analysis production reads. Everything else is intermediate. Besides the
+# plain HLT2.DST / SPRUCE.DST, filtered productions publish a distinct filetype
+# per filter -- HLT2_FILTERED_<hash>.DST / SPRUCE_FILTERED_<hash>.DST (e.g. the
+# +DisabledFunctors samples), and the earlier hyphenated HLT2-FILTERED-<hash>.DST
+# -- those are analysis inputs too. Bare ".DST" is far too broad: it would readmit
+# ALLSTREAMS.DST and the Run1/2 *.STRIP.DST families that automatically_configure
+# cannot set up. .XDST is likewise excluded, matching the plain-DST-only rule.
+_ANALYSIS_FILETYPE_RE = re.compile(
+    r"^(HLT2|SPRUCE)([_-]FILTERED[_-][0-9A-Fa-f]+)?\.DST$"
+)
 
 # Polarity token embedded in a condition description.
 _POLARITY_RE = re.compile(r"Mag(Up|Down|Off)")
@@ -181,7 +189,7 @@ def _samples_by_event_type() -> dict[str, list[dict]]:
     for row in snapshot["rows"]:
         if row[idx["config_name"]] != "MC":
             continue
-        if row[idx["filetype"]] not in ANALYSIS_FILETYPES:
+        if not _ANALYSIS_FILETYPE_RE.match(row[idx["filetype"]]):
             continue
         record = _parse_snapshot_row(row, idx)
         if record is None:

{lbaplocal-0.12.0 → lbaplocal-0.12.2}/src/LbAPLocal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LbAPLocal
-Version: 0.12.0
+Version: 0.12.2
 Summary: Tool to locally run tests for AnalysisProductions
 Author: LHCb
 Project-URL: Homepage, https://gitlab.cern.ch/lhcb-dpa/analysis-productions/lbaplocal

lbaplocal-0.12.2/src/LbAPLocal.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.12.2",
+  "distance": 0,
+  "node": "ge6fb1806a34965ce5a4a383f643fc9915375e434",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-08-12"
+}

{lbaplocal-0.12.0 → lbaplocal-0.12.2}/tests/test_generate.py

@@ -337,10 +337,10 @@ def test_generate_MC_multiple_lines(tmp_path, monkeypatch):
     assert result.exit_code == 0, result.output
 
     options_text = (tmp_path / "test" / "options.py").read_text()
-    # Both lines are the default set, each with a descriptor slot, tupled in a loop.
+    # Both lines are the default set, each with a descriptor slot, tupled per line.
     for line in lines:
         assert f'"{line}",' in options_text
-    assert "for line in lines:" in options_text
+    assert "configure_funtuple(line" in options_text
     assert "--skip-line" in options_text
 
     # Every sample runs every line by default, so the job needs no override.

{lbaplocal-0.12.0 → lbaplocal-0.12.2}/tests/test_mc_lookup.py

@@ -112,6 +112,67 @@ def test_mc_view_from_snapshot(snapshot):
     assert not mc_lookup.has_samples("94000000")
 
 
+def test_filtered_dst_variants_included(snapshot):
+    """Filtered productions publish a per-filter filetype; those count as samples.
+
+    HLT2_FILTERED_<hash>.DST / SPRUCE_FILTERED_<hash>.DST (and the older
+    hyphenated HLT2-FILTERED-<hash>.DST) are analysis inputs, so they must be
+    offered -- some event types exist only as filtered DSTs. The broad legacy
+    formats (ALLSTREAMS/Stripping) and .XDST stay excluded.
+    """
+    snapshot(
+        [
+            # underscore-form filtered HLT2 (e.g. a +DisabledFunctors production)
+            [
+                "MC",
+                "2024",
+                _CONDITION,
+                "/Sim10h/HLT2_FILTERED-2024.W35.39+DisabledFunctors",
+                "13264021",
+                "HLT2_FILTERED_52EACF17.DST",
+            ],
+            # hyphenated filtered HLT2 (earlier naming) -- same format
+            [
+                "MC",
+                "2024",
+                _CONDITION,
+                "/Sim10e/HLT2-Filtered-2024.W35.39",
+                "13264021",
+                "HLT2-FILTERED-96AC3C1C.DST",
+            ],
+            # filtered Spruce
+            [
+                "MC",
+                "2024",
+                _CONDITION,
+                "/Sim10h/HLT2-2024.W35.39/Spruce25r1_FILTERED+DisabledFunctors",
+                "13884001",
+                "SPRUCE_FILTERED_1BF1BEE3.DST",
+            ],
+            # .XDST filtered -> excluded (extended DST, like plain DST-only rule)
+            [
+                "MC",
+                "2024",
+                _CONDITION,
+                "/Sim10h/HLT2_FILTERED-2024.W35.39",
+                "13884001",
+                "HLT2_FILTERED_B71FA064.XDST",
+            ],
+            # legacy merged / Stripping streams -> excluded
+            ["MC", "2024", _CONDITION, "/Sim10d/HLT2-x", "13264021", "ALLSTREAMS.DST"],
+            ["MC", "2024", _CONDITION, "/Sim10d/Strip", "13264021", "B2DH.STRIP.DST"],
+        ]
+    )
+
+    hlt2 = mc_lookup.get_samples("13264021")
+    assert {s["filetype"] for s in hlt2} == {
+        "HLT2_FILTERED_52EACF17.DST",
+        "HLT2-FILTERED-96AC3C1C.DST",
+    }
+    spruce = mc_lookup.get_samples("13884001")
+    assert {s["filetype"] for s in spruce} == {"SPRUCE_FILTERED_1BF1BEE3.DST"}
+
+
 def test_snapshot_missing_column_rejected(snapshot):
     """A snapshot predating the event_type rename says so, not KeyError."""
     path = snapshot([])

lbaplocal-0.12.0/src/LbAPLocal.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.12.0",
-  "distance": 0,
-  "node": "g2eafc73c3587ec77e5396b304f9890cfe321bb38",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-10"
-}