diff --git a/workflow/conf/biohpc.config b/workflow/conf/biohpc.config index 6c9806f8c86b11633c6ef574b38993aad0aaebf8..73bffa1bf48c922a9a188af2e108ea5dc345d9ed 100644 --- a/workflow/conf/biohpc.config +++ b/workflow/conf/biohpc.config @@ -53,7 +53,7 @@ process { executor = 'local' } withName: diffPeaks { - module = ['R/3.4.1-gccmkl'] + module = ['R/3.3.2-gccmkl'] cpus = 32 } withName: motifSearch { diff --git a/workflow/main.nf b/workflow/main.nf index 2dbf708f4553a5ea5dc91a88be3dc635554e9940..b8691641d0599a23ef0783bdde4d845862076e23 100644 --- a/workflow/main.nf +++ b/workflow/main.nf @@ -428,7 +428,6 @@ process diffPeaks { script: if (noUniqueExperiments.size() == 1) { """ - touch design_diffpeak_annotatePeaks.tsv touch no_diffbind.bed touch no_diffbind.csv touch heatmap.pdf @@ -438,7 +437,7 @@ process diffPeaks { } else { """ - Rscript $baseDir/scripts/dba.R $designDiffPeaks + Rscript $baseDir/scripts/diff_peaks.R $designDiffPeaks """ } diff --git a/workflow/scripts/diff_peaks.R b/workflow/scripts/diff_peaks.R index 31ccf7239017efa9013e6c5201318f27795b2fef..76caa95495c7cae1d014530e78e1e1e3c4af09dc 100644 --- a/workflow/scripts/diff_peaks.R +++ b/workflow/scripts/diff_peaks.R @@ -8,7 +8,7 @@ args <- commandArgs(trailingOnly=TRUE) # Check input args if (length(args) != 1) { - stop("Usage: dba.r [ annotate_design.tsv ] ", call.=FALSE) + stop("Usage: diff_peaks.R [ annotate_design.tsv ] ", call.=FALSE) } # Build DBA object from design file @@ -48,7 +48,3 @@ for (i in c(1:length(data$contrasts))) { write.table(report,contrast_name,sep="\t",quote=F,row.names=F) write.table(report[,c(1:3)],contrast_bed_name,sep="\t",quote=F,row.names=F, col.names=F) } - -# Write new design file -newdesign = data.frame(Condition=new_SampleID, Peaks=new_Peaks) -write.csv(newdesign,"design_diffpeak_annotatePeaks.csv",row.names=F, quote=F, sep='\t')