# HG changeset patch # User mingchen0919 # Date 1520399575 18000 # Node ID db9da9716914e7129673a130da42e4ebb6d78102 # Parent cc33706a1d4b44d55227a51769231e1e638b1c64 add r-dt diff -r cc33706a1d4b -r db9da9716914 htseq_count.Rmd --- a/htseq_count.Rmd Tue Mar 06 17:38:58 2018 -0500 +++ b/htseq_count.Rmd Wed Mar 07 00:12:55 2018 -0500 @@ -11,15 +11,47 @@ ``` -# Code for computational analysis +## Run htseq-count + +```{bash} +cd ${X_d} -```{r 'step 1'} +cat >htseq-count.sh < counts.txt + + grep -v '__no_feature\|__ambiguous\|__too_low_aQual\|__not_aligned\|__alignment_not_unique' counts.txt > ${X_c} +EOF +``` + + +```{r} +# display htseq-count job script +htseq_count_sh = paste0(opt$X_d, '/htseq-count.sh') +tags$code(tags$pre(readChar(htseq_count_sh, file.info(htseq_count_sh)$size ))) opt ``` +```{bash} +cd ${X_d} +sh htseq-count.sh +``` -```{r 'ste[ 2'} +## Counts +```{r} +count_data = read.table(paste0(opt$X_d, '/counts.txt'), row.names = 1) +sample_names = trimws(strsplit(opt$X_B, ',')[[1]]) +colnames(count_data) = rep(sample_names, length = ncol(count_data)) +DT::datatable(count_data, caption = "htseq counts for each sample") ``` diff -r cc33706a1d4b -r db9da9716914 htseq_count.sh --- a/htseq_count.sh Tue Mar 06 17:38:58 2018 -0500 +++ b/htseq_count.sh Wed Mar 07 00:12:55 2018 -0500 @@ -1,4 +1,4 @@ -Rscript '${__tool_directory__}/aurora_htseq_count.R' +Rscript '${__tool_directory__}/htseq_count_render.R' -e $echo -o $report @@ -6,11 +6,14 @@ -s $sink_message -t '${__tool_directory__}' + -A '$alignment_files' + -B '$sample_names' + -G $gff -f $format -r $order -S $stranded -a $minaqual -T $feature_type -i $idattr - -I $additional_attr - -m $mode \ No newline at end of file + -m $mode + -c $count \ No newline at end of file diff -r cc33706a1d4b -r db9da9716914 htseq_count.xml --- a/htseq_count.xml Tue Mar 06 17:38:58 2018 -0500 +++ b/htseq_count.xml Wed Mar 07 00:12:55 2018 -0500 @@ -10,7 +10,7 @@ - + -m $mode + -c $count]]> - - + + + @@ -55,9 +62,6 @@ - @@ -67,7 +71,7 @@ - diff -r cc33706a1d4b -r db9da9716914 htseq_count_render.R --- a/htseq_count_render.R Tue Mar 06 17:38:58 2018 -0500 +++ b/htseq_count_render.R Wed Mar 07 00:12:55 2018 -0500 @@ -10,6 +10,7 @@ library(getopt) library(rmarkdown) +library(htmltools) #------------------------------------------------ @@ -21,15 +22,16 @@ spec_matrix = as.matrix( data.frame(stringsAsFactors=FALSE, - long_flags = c("X_e", "X_o", "X_d", "X_s", "X_t", "X_f", "X_r", - "X_S", "X_a", "X_T", "X_i", "X_I", "X_m"), - short_flags = c("e", "o", "d", "s", "t", "f", "r", "S", "a", "T", - "i", "I", "m"), - argument_mask_flags = c(1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L), + long_flags = c("X_e", "X_o", "X_d", "X_s", "X_t", "X_A", "X_B", "X_G", + "X_f", "X_r", "X_S", "X_a", "X_T", "X_i", "X_m", "X_c"), + short_flags = c("e", "o", "d", "s", "t", "A", "B", "G", "f", "r", "S", + "a", "T", "i", "m", "c"), + argument_mask_flags = c(1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, + 1L, 1L, 1L), data_type_flags = c("character", "character", "character", "character", - "character", "character", "character", + "character", "character", "character", "character", "character", "character", "character", "character", - "character", "character") + "character", "character", "character", "character") ) ) opt = getopt(spec_matrix) diff -r cc33706a1d4b -r db9da9716914 spec.txt --- a/spec.txt Tue Mar 06 17:38:58 2018 -0500 +++ b/spec.txt Wed Mar 07 00:12:55 2018 -0500 @@ -4,11 +4,12 @@ X_d,d,1,character X_s,s,1,character X_t,t,1,character +X_A,A,1,character +X_G,G,1,character X_f,f,1,character X_r,r,1,character X_S,S,1,character X_a,a,1,character X_T,T,1,character X_i,i,1,character -X_I,I,1,character X_m,m,1,character