proc file key fixes

Author: ggmarshall

workflow/rules/dsp.smk

@@ -8,6 +8,8 @@ from legenddataflow.methods import ParsKeyResolve, ParsCatalog
 from pathlib import Path
 from legenddataflow.methods import patterns as patt
 from legenddataflowscripts.workflow import execenv_pyexe
+from legenddataflow.methods.paths import config_path
+
 
 build_merge_rules("dsp", lh5_merge=True)
 

workflow/rules/dsp_pars_geds.smk

@@ -417,7 +417,7 @@ rule build_pars_dsp_svm_geds:
         runtime=300,
     shell:
         execenv_pyexe(config, "par-geds-dsp-svm") + "--log {log} "
-        # "--input-file {input.dsp_pars} "
+        #"--input-file {input.svm} "
         "--output-file {output.dsp_pars} "
         "--svm-file {input.svm_file}"
 

workflow/src/legenddataflow/methods/FileKey.py

@@ -222,13 +222,13 @@ def get_path_from_filekey(self, pattern, **kwargs):
         return self.expand(pattern, **kwargs)
 
 
-class ChannelProcKey(FileKey):
+class ChannelProcKey(ProcessingFileKey):
     re_pattern = "all(-(?P<experiment>[^-]+)(\\-(?P<period>[^-]+)(\\-(?P<run>[^-]+)(\\-(?P<datatype>[^-]+)(\\-(?P<timestamp>[^-]+)(\\-(?P<channel>[^-]+))?)?)?)?)?)?$"
     key_pattern = full_channel_pattern_with_extension()
-    _fields = (*FileKey._fields, "channel")
+    _fields = (*ProcessingFileKey._fields, "channel")
 
-    def __new__(cls, experiment, period, run, datatype, timestamp, channel):
-        self = super().__new__(cls, experiment, period, run, datatype, timestamp)
+    def __new__(cls, experiment, period, run, datatype, timestamp, channel, processing_step):
+        self = super().__new__(cls, experiment, period, run, datatype, timestamp, processing_step)
         self.channel = channel
         return self
 
@@ -239,6 +239,7 @@ def name(self):
     def _asdict(self):
         dic = super()._asdict()
         dic["channel"] = self.channel
+        dic["processing_step"] = self.processing_step
         return dic
 
     @staticmethod