From c8f8536fa9a960cb82ca993f81ce2d041ec218f9 Mon Sep 17 00:00:00 2001
From: Tom Whalley <whalleyt@cardiff.ac.uk>
Date: Wed, 6 Nov 2024 10:56:43 +0000
Subject: [PATCH] update params

---
 main.nf                         | 15 +-----------
 modules/preprocessingModules.nf | 42 +--------------------------------
 workflows/preprocessing.nf      |  1 -
 3 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/main.nf b/main.nf
index 576f3de..aad613e 100644
--- a/main.nf
+++ b/main.nf
@@ -56,20 +56,7 @@ workflow {
 
     // create channels for kraken2 database and bowtie2 index
     krakenDB = Channel.fromPath( "${params.kraken.kraken_db}/*.k2d" )
-    bowtie_dir = Channel.fromPath( "${params.bowtie.bowtie2_index}/*.bt2" )
-
-    if(params.permissive == true){
-        params.permissive = "yes"
-    } else {
-        params.permissive = "no"
-    }
-
-    if(params.unmix_myco == true){
-        params.unmix_myco = "yes"
-    } else {
-        params.unmix_myco = "no"
-    }
-
+    bowtie_dir = Channel.fromPath( "${params.bowtie.bowtie_index}/*.bt2" )
 
     // main workflow
     main:
diff --git a/modules/preprocessingModules.nf b/modules/preprocessingModules.nf
index 74f7915..985a240 100644
--- a/modules/preprocessingModules.nf
+++ b/modules/preprocessingModules.nf
@@ -403,46 +403,6 @@ process afanc {
 }
 
 
-process mykrobe {
-    /**
-    * @QCcheckpoint none
-    */
-
-    tag { sample_name }
-    label 'preprocessing'
-    label 'normal_cpu'
-    label 'medium_memory'
-
-    publishDir "${params.output_dir}/$sample_name/speciation_reports_for_reads_postFastP", mode: 'copy', pattern: '*_mykrobe_report.json'
-    publishDir "${params.output_dir}/$sample_name/speciation_reports_for_reads_postFastP", mode: 'copy', pattern: '*_mykrobe_report.csv'
-
-    input:
-    tuple val(sample_name), path(fq1), path(fq2), val(run_mykrobe), path(software_json)
-
-    when:
-    run_mykrobe =~ /${sample_name}/
-
-    output:
-    tuple val(sample_name), path("${sample_name}_mykrobe_report.json"), stdout, emit: mykrobe_report
-    tuple val(sample_name), path(fq1), path(fq2), stdout, emit: mykrobe_fqs
-
-    script:
-    mykrobe_report = "${sample_name}_mykrobe_report"
-
-    """
-    mykrobe predict --sample ${sample_name} --species tb --threads ${task.cpus} --format json_and_csv --output ${mykrobe_report} -1 $fq1 $fq2
-    printf ${sample_name}
-    """
-
-    stub:
-    mykrobe_report = "${sample_name}_mykrobe_report.json"
-
-    """
-    touch ${mykrobe_report}
-    printf ${sample_name}
-    """
-}
-
 process bowtie2 {
     /**
     * @QCcheckpoint none
@@ -472,7 +432,7 @@ process bowtie2 {
     humanfree_fq2 = "${sample_name}_cleaned_2.fq"
 
     """
-    bowtie2 --very-sensitive -p ${task.cpus} -x ./${params.bowtie_index_name} -1 $fq1 -2 $fq2 | samtools view -f 4 -Shb - > ${bam}
+    bowtie2 --very-sensitive -p ${task.cpus} -x ./${params.bowtie.bowtie_index_name} -1 $fq1 -2 $fq2 | samtools view -f 4 -Shb - > ${bam}
     samtools fastq -1 ${humanfree_fq1} -2 ${humanfree_fq2} -s singleton.fq ${bam}
 
     rm -rf ${bam}
diff --git a/workflows/preprocessing.nf b/workflows/preprocessing.nf
index 5256f70..bfdd463 100644
--- a/workflows/preprocessing.nf
+++ b/workflows/preprocessing.nf
@@ -8,7 +8,6 @@ include {fastp} from '../modules/preprocessingModules.nf'
 include {fastQC} from '../modules/preprocessingModules.nf' 
 include {kraken2} from '../modules/preprocessingModules.nf'
 include {afanc} from '../modules/preprocessingModules.nf'
-include {mykrobe} from '../modules/preprocessingModules.nf'
 include {bowtie2} from '../modules/preprocessingModules.nf'
 include {checkBamValidity} from '../modules/preprocessingModules.nf'
 include {bam2fastq} from '../modules/preprocessingModules.nf'