fix: fix excluding events from the report (#332)

* fix: fix excluding events from the report * fix: restore else statement * chore * fix: add report activation option to the simple test
snakemake-workflows · Oct 23, 2024 · acdd9e3 · acdd9e3
1 parent 1629c6d
commit acdd9e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.test/config-simple/config.yaml b/.test/config-simple/config.yaml
@@ -50,6 +50,7 @@ calling:
     local: true
     events: 
       present:
+        report: false
         varlociraptor: 
           - x
           - y

diff --git a/workflow/rules/common.smk b/workflow/rules/common.smk
@@ -140,7 +140,7 @@ def get_final_output(wildcards):
 
     for calling_type in calling_types:
         if config["report"]["activate"]:
-            for event in config["calling"]["fdr-control"]["events"]:
+            for event in get_calling_events(calling_type):
                 if lookup(
                     dpath=f"calling/fdr-control/events/{event}/report",
                     within=config,
@@ -150,7 +150,7 @@ def get_final_output(wildcards):
                         expand(
                             "results/datavzrd-report/{batch}.{event}.{calling_type}.fdr-controlled",
                             batch=get_report_batches(calling_type),
-                            event=get_calling_events(calling_type),
+                            event=event,
                             calling_type=calling_type,
                         )
                     )
@@ -163,7 +163,7 @@ def get_final_output(wildcards):
                                 if calling_type == "variants"
                                 else fusions_groups
                             ),
-                            event=get_calling_events(calling_type),
+                            event=event,
                             calling_type=calling_type,
                         )
                     )