fix inheritabilities

Author: ggmarshall

workflow/rules/common.smk

@@ -32,7 +32,7 @@ def get_blinding_check_file(
     wildcards,
 ):
     """func to get the right blinding check file"""
-    par_files = ParsCatalog.get_files(raw_catalog, wildcards.timestamp)
+    par_files = raw_catalog.get_files(wildcards.timestamp)
     if isinstance(par_files, str):
         return Path(patt.get_pars_path(config, "raw")) / par_files
     else:

workflow/rules/dsp.smk

@@ -33,8 +33,8 @@ rule build_dsp:
     input:
         raw_file=get_pattern_tier(config, "raw", check_in_cycle=False),
         pars_file=ancient(
-            lambda wildcards: ParsCatalog.get_par_file(
-                dsp_par_catalog, config, wildcards.timestamp, "dsp"
+            lambda wildcards: dsp_par_catalog.get_par_file(
+                config, wildcards.timestamp, "dsp"
             )
         ),
     params:

workflow/rules/evt.smk

@@ -22,8 +22,8 @@ rule build_evt:
             if int(wildcards["period"][1:]) > 11
             else get_pattern_tier(config, "ann", check_in_cycle=False)
         ),
-        par_files=lambda wildcards: ParsCatalog.get_par_file(
-            hit_par_catalog, config, wildcards.timestamp, "hit"
+        par_files=lambda wildcards: hit_par_catalog.get_par_file(
+            config, wildcards.timestamp, "hit"
         ),
         xtalk_matrix=lambda wildcards: get_input_par_file(
             tier="evt", wildcards=wildcards, name="xtc"
@@ -73,8 +73,8 @@ rule build_pet:
             if int(wildcards["period"][1:]) > 11
             else get_pattern_tier(config, "pan", check_in_cycle=False)
         ),
-        par_files=lambda wildcards: ParsCatalog.get_par_file(
-            pht_par_catalog, config, wildcards.timestamp, "pht"
+        par_files=lambda wildcards: pht_par_catalog.get_par_file(
+            config, wildcards.timestamp, "pht"
         ),
         xtalk_matrix=lambda wildcards: get_input_par_file(
             tier="pet", wildcards=wildcards, name="xtc"

workflow/rules/hit.smk

@@ -32,8 +32,8 @@ build_merge_rules("hit", lh5_merge=False)
 rule build_hit:
     input:
         dsp_file=get_pattern_tier(config, "dsp", check_in_cycle=False),
-        pars_file=lambda wildcards: ParsCatalog.get_par_file(
-            hit_par_catalog, config, wildcards.timestamp, "hit"
+        pars_file=lambda wildcards: hit_par_catalog.get_par_file(
+            config, wildcards.timestamp, "hit"
         ),
     output:
         tier_file=get_pattern_tier(config, "hit", check_in_cycle=check_in_cycle),

workflow/rules/pht.smk

@@ -35,8 +35,8 @@ build_merge_rules("pht", lh5_merge=False)
 rule build_pht:
     input:
         dsp_file=get_pattern_tier(config, intier, check_in_cycle=False),
-        pars_file=lambda wildcards: ParsCatalog.get_par_file(
-            pht_par_catalog, config, wildcards.timestamp, "pht"
+        pars_file=lambda wildcards: pht_par_catalog.get_par_file(
+            config, wildcards.timestamp, "pht"
         ),
     output:
         tier_file=get_pattern_tier(config, "pht", check_in_cycle=check_in_cycle),

workflow/rules/psp.smk

@@ -33,8 +33,8 @@ rule build_psp:
     input:
         raw_file=get_pattern_tier(config, "raw", check_in_cycle=False),
         pars_file=ancient(
-            lambda wildcards: ParsCatalog.get_par_file(
-                psp_par_catalog, config, wildcards.timestamp, "psp"
+            lambda wildcards: psp_par_catalog.get_par_file(
+                config, wildcards.timestamp, "psp"
             )
         ),
     params:

workflow/src/legenddataflow/create_pars_keylist.py

@@ -7,13 +7,13 @@
 from pathlib import Path
 
 from dbetto import time
-from dbetto.catalog import Catalog
 
 from .FileKey import FileKey, ProcessingFileKey, regex_from_filepattern
+from .pars_loading import ParsCatalog
 from .patterns import par_validity_pattern
 
 
-class ParsKeyResolve(Catalog):
+class ParsKeyResolve(ParsCatalog):
     @staticmethod
     def match_keys(key1, key2):
         if (
@@ -115,4 +115,4 @@ def get_par_catalog(cls, keypart, search_patterns, name_dict):
             warnings.warn(msg, stacklevel=0)
             fk = FileKey("l200", "p00", "r000", "cal", "20230101T000000Z")
             entrylist = [ParsKeyResolve.entry_from_filekey(fk, name_dict)]
-        return Catalog({"all": entrylist})
+        return cls({"all": entrylist})

workflow/src/legenddataflow/pars_loading.py

@@ -52,8 +52,7 @@ def match_pars_files(filelist1: list, filelist2: list) -> tuple[list, list]:
                         filelist2 = []
         return filelist1, filelist2
 
-    @staticmethod
-    def get_par_file(catalog, setup: dict, timestamp: str, tier: str) -> list:
+    def get_par_file(self, setup: dict, timestamp: str, tier: str) -> list:
         """
         Takes the par file and par overwrite file for a particular timestamp
         combines the two lists, applying the overwrite files to the par files
@@ -73,7 +72,7 @@ def get_par_file(catalog, setup: dict, timestamp: str, tier: str) -> list:
         list
             List of par files
         """
-        pars_files = catalog.valid_for(timestamp)
+        pars_files = self.valid_for(timestamp)
         par_overwrite_file = Path(par_overwrite_path(setup)) / tier / "validity.yaml"
         pars_files_overwrite = ParsCatalog.get_files(par_overwrite_file, timestamp)
         if len(pars_files_overwrite) > 0: