correction to add the fasta to the submission subworkflow channel

CDCgov · Apr 9, 2024 · 905f122 · 905f122
1 parent a68466d
commit 905f122
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/bin/repeatmasker_liftoff.py b/bin/repeatmasker_liftoff.py
@@ -61,6 +61,8 @@ def annotation_main():
 
     #gather ref sample id
     ref_id=ref_gff['seq_id'][0]
+    print(f'refgff is {args.refgff}')
+    print(ref_gff.head())
     #gather index of attributes for first and second ITRs; needed for repeatmasker ITR attributes
     first_ITR_index=ref_gff[ref_gff['attributes'].str.contains("ITR")].index[0]
     last_ITR_index=ref_gff[ref_gff['attributes'].str.contains("ITR")].index[-1]

diff --git a/modules/local/concat_gffs/main.nf b/modules/local/concat_gffs/main.nf
@@ -21,14 +21,10 @@ process CONCAT_GFFS {
 
 	input:
 	path ref_gff_path
-	//path repeatmasker_gff
-    //path liftoff_gff
-    tuple val(meta), path(repeatmasker_gff), path(liftoff_gff)
-	tuple val(meta), path(fasta_path), path(fastq_1), path(fastq_2)
+    tuple val(meta), path(fasta_path), path(fastq_1), path(fastq_2), path(repeatmasker_gff), path(liftoff_gff)
 
 	script:
 	"""
-    echo "repeatmasker_liftoff.py --repeatm_gff $repeatmasker_gff --liftoff_gff $liftoff_gff --refgff $ref_gff_path --fasta $fasta_path  --sample_name $meta.id"
 	repeatmasker_liftoff.py --repeatm_gff $repeatmasker_gff --liftoff_gff $liftoff_gff --refgff $ref_gff_path --fasta $fasta_path  --sample_name $meta.id
 	"""
 

diff --git a/subworkflows/local/repeatmasker_liftoff.nf b/subworkflows/local/repeatmasker_liftoff.nf
@@ -13,7 +13,7 @@ include { CONCAT_GFFS                                       } from "../../module
 workflow REPEATMASKER_LIFTOFF {
 
     take:
-        fasta
+        fasta // meta, fasta_path, fastq1, fastq2
 
     main:
         // run repeatmasker annotation on files
@@ -31,24 +31,23 @@ workflow REPEATMASKER_LIFTOFF {
         repeatmasker_gff_ch = REPEATMASKER.out.gff.collect().flatten()
                 .map { 
                     meta = [:] 
-                    meta['id'] = [id:it.getSimpleName()] 
+                    meta['id'] = it.getSimpleName()
                     [ meta, it ] 
                 }
 
         liftoff_gff_ch = LIFTOFF_CLI.out.gff.collect().flatten()
                 .map { 
                     meta = [:] 
-                    meta['id'] = [id:it.getSimpleName()] 
+                    meta['id'] = it.getSimpleName()
                     [ meta, it ] 
                 }
 
-        concat_gffs_ch = repeatmasker_gff_ch.join(liftoff_gff_ch) // meta.id, fasta, repeatmasker_gff, liftoff_gff
+        concat_gffs_ch = fasta.join(repeatmasker_gff_ch).join(liftoff_gff_ch) // meta.id, fasta, fastq1, fastq2, repeatmasker_gff, liftoff_gff
 
-        // concat gffs
+        // concat gffs 
         CONCAT_GFFS (
            params.ref_gff_path,
-           concat_gffs_ch,
-           fasta
+           concat_gffs_ch
         )
 
     emit:

diff --git a/workflows/tostadas.nf b/workflows/tostadas.nf
@@ -153,6 +153,9 @@ workflow TOSTADAS {
         GET_WAIT_TIME (
             METADATA_VALIDATION.out.tsv_Files.collect() 
         )
+
+        submission_ch.view()
+
         INITIAL_SUBMISSION (
             submission_ch,  // meta.id, fasta, fastq1, fastq2, gff
             params.submission_config,