diff --git a/src/.docker_modules/r-scripts/1.0/HBV_RNAs_count_2.R b/src/.docker_modules/r-scripts/1.0/HBV_RNAs_count.R
similarity index 98%
rename from src/.docker_modules/r-scripts/1.0/HBV_RNAs_count_2.R
rename to src/.docker_modules/r-scripts/1.0/HBV_RNAs_count.R
index 0010d510fd1dd21d2ed0fbc3769647fead779edb..ea15c73677d5bd5d9a21cd23eee4d02a6d4c0fad 100755
--- a/src/.docker_modules/r-scripts/1.0/HBV_RNAs_count_2.R
+++ b/src/.docker_modules/r-scripts/1.0/HBV_RNAs_count.R
@@ -1,5 +1,5 @@
#!/bin/Rscript
-# Packages installation
+# Packages loading
library(ggplot2, quietly = TRUE)
library(tidyr, quietly = TRUE)
library(plyr, quietly = TRUE)
@@ -60,7 +60,7 @@ palette_complete <- rbind.data.frame(palette_TSS,
stringsAsFactors = FALSE)
# Load Start_positions_count files:
-identified_SP <- read.table(file = opt$SPvariants[1],
+identified_SP <- read.table(file = opt$SPvariants,
header = TRUE)
clean_SP <- identified_SP[!duplicated(identified_SP$id),] %>%
@@ -108,7 +108,7 @@ ggsave(file = "SP_proportion.png",
dpi = 300)
# TSS not spliced:
-classified_reads <- read.table(file = opt$classification[1],
+classified_reads <- read.table(file = opt$classification,
header = TRUE)
not_spliced <- classified_reads[!(classified_reads$read_ID %in% clean_SP$id),]
diff --git a/src/.docker_modules/r-scripts/1.0/Junctions_NanoSplicer_2.R b/src/.docker_modules/r-scripts/1.0/Junctions_NanoSplicer.R
similarity index 99%
rename from src/.docker_modules/r-scripts/1.0/Junctions_NanoSplicer_2.R
rename to src/.docker_modules/r-scripts/1.0/Junctions_NanoSplicer.R
index 720226d47e2cc744a6453d92755157628b0b4952..bce38457601babac31813c62f3362a8736683671 100644
--- a/src/.docker_modules/r-scripts/1.0/Junctions_NanoSplicer_2.R
+++ b/src/.docker_modules/r-scripts/1.0/Junctions_NanoSplicer.R
@@ -12,19 +12,19 @@ library(optparse)
# Load classification per promoter:
option_list = list(
- make_option(c("-c", "--classification"), type="character", default=NULL,
+ make_option(c("-c", "--classification"), type="character", default="./classification.txt",
help="input classification or reads file (.txt)", metavar="character"),
make_option(c("-j", "--jwr"), type="character", default=NULL,
help="input nanosplicer results table (.csv)", metavar="character"))
opt_parser = OptionParser(option_list=option_list)
opt = parse_args(opt_parser)
-reads_pos <- read.table(opt$classification[1],
+reads_pos <- read.table(opt$classification,
sep = "\t")
colnames(reads_pos) <- c("id", reads_pos[1,2:length(reads_pos[1,])])
reads_pos <- reads_pos[2:length(reads_pos$id),]
# Load Nanosplicer results:
-df <- read.csv(opt$jwr[1])
+df <- read.csv(opt$jwr)
colnames(df)[1] <- "juncNumber"
# split donor and acceptor positions:
diff --git a/src/.docker_modules/r-scripts/1.0/start_positions_individuals_2.R b/src/.docker_modules/r-scripts/1.0/Start_positions.R
similarity index 98%
rename from src/.docker_modules/r-scripts/1.0/start_positions_individuals_2.R
rename to src/.docker_modules/r-scripts/1.0/Start_positions.R
index 31b4e61afa8637a201ded2fa00eb8510e7a693be..683336e0aadc3fa2dd71374f3e4f3a2b4a07c6f5 100755
--- a/src/.docker_modules/r-scripts/1.0/start_positions_individuals_2.R
+++ b/src/.docker_modules/r-scripts/1.0/Start_positions.R
@@ -1,5 +1,5 @@
#!/bin/Rscript
-# Packages installation
+# Packages loading
library(dplyr)
library(ggplot2)
library(RColorBrewer)
@@ -25,8 +25,8 @@ opt = parse_args(opt_parser)
# pattern="*.txt",
# all.files=FALSE,
# full.names=FALSE)
-file_to_load <- opt$input[1]
-splitted <- strsplit(opt$input[1], split = "[/]")[[1]]
+file_to_load <- opt$input
+splitted <- strsplit(opt$input, split = "[/]")[[1]]
filename <- strsplit(splitted[length(splitted)], split = "[.]")[[1]][1]
sam_bc01 <- read.table(file_to_load, header = F)
diff --git a/src/nf_modules/junction_nanosplicer/main.nf b/src/nf_modules/junction_nanosplicer/main.nf
index 8598562f4aa469c48d37fa9ef81b3e9413709163..4af81e2a33592f4ec2f53a9c137c365f58b94eba 100644
--- a/src/nf_modules/junction_nanosplicer/main.nf
+++ b/src/nf_modules/junction_nanosplicer/main.nf
@@ -11,8 +11,8 @@ process junctions_nanosplicer{
}
input:
+ path(txt)
path(csv)
- path(classification_of_reads_per_RNA)
output:
path("Rplots.pdf")
@@ -21,6 +21,6 @@ process junctions_nanosplicer{
script:
"""
- Rscript /Junctions_NanoSplicer/Junctions_NanoSplicer_2.R
+ Rscript Junctions_NanoSplicer.R -c txt -j csv
"""
}
\ No newline at end of file
diff --git a/src/nf_modules/rna_count/main.nf b/src/nf_modules/rna_count/main.nf
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5899f2ed15d6e833006b1e799394ab2346972bcf 100644
--- a/src/nf_modules/rna_count/main.nf
+++ b/src/nf_modules/rna_count/main.nf
@@ -0,0 +1,25 @@
+version = "1.0"
+container_url = "xgrand/r-scripts:${version}"
+
+params.rna_count_out = ""
+process rna_count{
+ container = "${container_url}"
+ label "small_mem_mono_cpus"
+ tag "RNA quantification"
+ if (params.rna_count_out != "") {
+ publishDir "results/${params.rna_count_out}", mode: 'copy'
+ }
+
+ input:
+ path(spvariants)
+ path(classification)
+
+ output:
+ path("*.csv")
+ path("*.pdf")
+
+ script:
+ """
+ Rscript HBV_RNAs_count.R -s spvariants -c classification
+ """
+}
diff --git a/src/nf_modules/start_positions/main.nf b/src/nf_modules/start_positions/main.nf
index 06e2e4f14e5d1c0233f7c819b85fd042b3cf3a18..4a29e9fed7d7dd37dfa1610086c2232e13250794 100644
--- a/src/nf_modules/start_positions/main.nf
+++ b/src/nf_modules/start_positions/main.nf
@@ -5,7 +5,7 @@ params.start_position_counts_out = ""
process start_position_individuals{
container = "${container_url}"
label "small_mem_mono_cpus"
- tag "identification de variants d'épissage"
+ tag "start positions"
if (params.start_position_counts_out != "") {
publishDir "results/${params.start_position_counts_out}", mode: 'copy'
}
@@ -20,6 +20,6 @@ process start_position_individuals{
script:
"""
- Rscript start_positions_individuals.R -i start_position_counts
+ Rscript start_positions.R -i start_position_counts
"""
}
\ No newline at end of file