Add phasing window (#16)

* Add phasing window * Add phasing window to beagle * Simplify syntax * Fix typo * Remove characters in beagle call
genepi · Jun 14, 2024 · 1677b34 · 1677b34
1 parent 172116a
commit 1677b34
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/modules/local/imputation/minimac4.nf b/modules/local/imputation/minimac4.nf
@@ -11,10 +11,10 @@ process MINIMAC4 {
 
     script:
     def map = minimac_map ? '--referenceEstimates --map ' + minimac_map : ''
-    def chunkfile_name = "${chunkfile}".replaceAll('.vcf.gz', '')
-    def chr_cleaned = "${chr}".startsWith('X.') ? 'X' : "${chr}"
-    def chr_mapped = "${params.refpanel.build}" == 'hg38' ? 'chr' + "${chr_cleaned}" : "${chr_cleaned}"
-    def isChrM = "${chr}" == 'MT' ? '--myChromosome ' + "${chr}" : ''
+    def chunkfile_name = chunkfile.toString().replaceAll('.vcf.gz', '')
+    def chr_cleaned = chr.startsWith('X.') ? 'X' : chr
+    def chr_mapped = (params.refpanel.build == 'hg38') ? 'chr' + chr_cleaned : chr_cleaned
+    def isChrM = (chr == 'MT') ? '--myChromosome ' + chr : ''
 
     """
     minimac4 \

diff --git a/modules/local/phasing/beagle.nf b/modules/local/phasing/beagle.nf
@@ -10,18 +10,21 @@ process BEAGLE {
 
     script:
     //define basename without ending (do not use simpleName due to X.*)
-    def chunkfile_name = "$chunkfile".replaceAll('.vcf.gz', '')
+    def chunkfile_name = chunkfile.toString().replaceAll('.vcf.gz', '')
     // replace X.nonPAR etc with X for phasing
-    def chr_cleaned = "${chr}".startsWith('X.') ? 'X' : "${chr}"
-    def chr_mapped = "${params.refpanel.build}" == 'hg38' ? 'chr' + "${chr_cleaned}" : "${chr_cleaned}"
-
+    def chr_cleaned = chr.startsWith('X.') ? 'X' : chr
+    def chr_mapped = params.refpanel.build == 'hg38' ? 'chr' + chr_cleaned : chr_cleaned
+    def phasing_start = start.toLong() - params.phasing_window
+    phasing_start = phasing_start < 0 ? 1 : phasing_start
+    def phasing_end = end.toLong() + params.phasing_window
+
     """
     java -jar /usr/bin/beagle.18May20.d20.jar \
         ref=${bcf}  \
         gt=${chunkfile} \
         out=${chunkfile_name}.phased \
         nthreads=${task.cpus} \
-        chrom=${chr_mapped}:${start}-${end} \
+        chrom=${chr_mapped}:${phasing_start}-${phasing_end} \
         map=${map_beagle} \
         impute=false 
     """

diff --git a/modules/local/phasing/eagle.nf b/modules/local/phasing/eagle.nf
@@ -11,11 +11,13 @@ process EAGLE {
 
     script:
     //define basename without ending (do not use simpleName due to X.*)
-    def chunkfile_name = "$chunkfile".replaceAll('.vcf.gz', '')
+    def chunkfile_name = chunkfile.toString().replaceAll('.vcf.gz', '')
     // replace X.nonPAR etc with X for phasing
-    def chr_cleaned = "${chr}".startsWith('X.') ? 'X' : "${chr}"
-    def chr_mapped = "${params.refpanel.build}" == 'hg38' ? 'chr' + "${chr_cleaned}" : "${chr_cleaned}"
-
+    def chr_cleaned = chr.startsWith('X.') ? 'X' : chr
+    def chr_mapped = params.refpanel.build == 'hg38' ? 'chr' + chr_cleaned : chr_cleaned
+    def phasing_start = start.toLong() - params.phasing_window
+    phasing_start = phasing_start < 0 ? 1 : phasing_start
+    def phasing_end = end.toLong() + params.phasing_window
     """
     tabix $chunkfile
     eagle \
@@ -24,8 +26,8 @@ process EAGLE {
         --geneticMapFile ${map_eagle} \
         --outPrefix ${chunkfile_name}.phased \
         --chrom $chr_mapped \
-        --bpStart $start \
-        --bpEnd $end \
+        --bpStart $phasing_start \
+        --bpEnd $phasing_end \
         --allowRefAltSwap \
         --vcfOutFormat z \
         --keepMissingPloidyX \