fix defaults so can dry run

Author: ggmarshall

workflow/Snakefile

@@ -21,6 +21,7 @@ import logging
 from dbetto import AttrsDict
 from legendmeta import LegendMetadata
 from legenddataflow import CalGrouping, execenv, utils
+from legenddataflow.patterns import get_pattern_tier
 
 utils.subst_vars_in_snakemake_config(workflow, config)
 config = AttrsDict(config)
@@ -89,7 +90,7 @@ onstart:
         hit_par_cat_file.unlink()
     try:
         Path(hit_par_cat_file).parent.mkdir(parents=True, exist_ok=True)
-        ParsKeyResolve.write_to_yaml(hit_par_catalog, hit_par_cat_file)
+        hit_par_catalog.write_to(hit_par_cat_file)
     except NameError:
         print("No hit parameter catalog found")
 
@@ -98,7 +99,7 @@ onstart:
         pht_par_cat_file.unlink()
     try:
         Path(pht_par_cat_file).parent.mkdir(parents=True, exist_ok=True)
-        ParsKeyResolve.write_to_yaml(pht_par_catalog, pht_par_cat_file)
+        pht_par_catalog.write_to(pht_par_cat_file)
     except NameError:
         print("No pht parameter catalog found")
 
@@ -107,7 +108,7 @@ onstart:
         dsp_par_cat_file.unlink()
     try:
         Path(dsp_par_cat_file).parent.mkdir(parents=True, exist_ok=True)
-        ParsKeyResolve.write_to_yaml(dsp_par_catalog, dsp_par_cat_file)
+        dsp_par_catalog.write_to(dsp_par_cat_file)
     except NameError:
         print("No dsp parameter catalog found")
 
@@ -116,7 +117,7 @@ onstart:
         psp_par_cat_file.unlink()
     try:
         Path(psp_par_cat_file).parent.mkdir(parents=True, exist_ok=True)
-        ParsKeyResolve.write_to_yaml(psp_par_catalog, psp_par_cat_file)
+        psp_par_catalog.write_to(psp_par_cat_file)
     except NameError:
         print("No psp parameter catalog found")
 
@@ -165,7 +166,7 @@ rule gen_filelist:
         lambda wildcards: get_filelist(
             wildcards,
             config,
-            get_search_pattern(wildcards.tier),
+            get_pattern_tier(config, "raw", check_in_cycle=False),
             ignore_keys_file=Path(det_status) / "ignored_daq_cycles.yaml",
             analysis_runs_file=Path(det_status) / "runlists.yaml",
         ),

workflow/Snakefile-build-raw

@@ -61,7 +61,7 @@ onstart:
         raw_par_cat_file.unlink()
     try:
         Path(raw_par_cat_file).parent.mkdir(parents=True, exist_ok=True)
-        ParsKeyResolve.write_to_yaml(raw_par_catalog, raw_par_cat_file)
+        raw_par_catalog.write_to(raw_par_cat_file)
     except NameError:
         print("WARNING: no raw parameter catalog found")
 

workflow/src/legenddataflow/cal_grouping.py

@@ -186,7 +186,7 @@ def get_timestamp(
             fk = ChannelProcKey.get_filekey_from_pattern(Path(par_files[0]).name)
             return fk.timestamp
         else:
-            return "20200101T000000Z"
+            return "20240101T000000Z"
 
     def get_wildcard_constraints(self, dataset, channel):
         if channel == "default":

workflow/src/legenddataflow/create_pars_keylist.py

@@ -96,8 +96,8 @@ def get_keys(keypart, search_pattern):
                 keys.append(key)
         return keys
 
-    @staticmethod
-    def get_par_catalog(keypart, search_patterns, name_dict):
+    @classmethod
+    def get_par_catalog(cls, keypart, search_patterns, name_dict):
         if isinstance(keypart, str):
             keypart = [keypart]
         if isinstance(search_patterns, (str, Path)):
@@ -113,5 +113,6 @@ def get_par_catalog(keypart, search_patterns, name_dict):
         else:
             msg = "No Keys found"
             warnings.warn(msg, stacklevel=0)
-            entrylist = [ParsKeyResolve("00000000T000000Z", "all", [])]
+            fk = FileKey("l200", "p00", "r000", "cal", "20230101T000000Z")
+            entrylist = [ParsKeyResolve.entry_from_filekey(fk, name_dict)]
         return Catalog({"all": entrylist})