diff --git a/workflow/scripts/convertGeneSymbols.R b/workflow/scripts/convertGeneSymbols.R index 05a1528e73525f96b87a9127bb3b4884693299f9..6cc5c0a1089881ae1dfd32e248a1ffbcbcd7b24a 100644 --- a/workflow/scripts/convertGeneSymbols.R +++ b/workflow/scripts/convertGeneSymbols.R @@ -7,7 +7,7 @@ option_list=list( opt=parse_args(OptionParser(option_list=option_list)) rm(option_list) -countTable <- read.csv(paste0(opt$repRID,"_countTable.csv"), stringsAsFactors=FALSE) +countTable <- read.csv(paste0(opt$repRID,".countTable.csv"), stringsAsFactors=FALSE) geneID <- read.delim("geneID.tsv", header=FALSE, stringsAsFactors=FALSE) Entrez <- read.delim("Entrez.tsv", header=FALSE, stringsAsFactors=FALSE) @@ -23,4 +23,4 @@ output <- merge(x=convert,y=countTable[,c("gene_name","gene_id","count","tpm")], colnames(output) <- c("GENCODE_Gene_Symbol","NCBI_GeneID","Ensembl_GeneID","count","tpm") output <- output[,c(1,3,2,4:5)] -write.table(output,file=paste0(opt$repRID,".tpmTable.csv"),sep=",",row.names=FALSE,quote=FALSE) +write.table(output,file=paste0(opt$repRID,"_tpmTable.csv"),sep=",",row.names=FALSE,quote=FALSE) diff --git a/workflow/tests/test_makeFeatureCounts.py b/workflow/tests/test_makeFeatureCounts.py index e67bca804a3a1bcf1787a55088a95528076f08fe..f6373b99109e1d618dcb65559d24977140a125a4 100644 --- a/workflow/tests/test_makeFeatureCounts.py +++ b/workflow/tests/test_makeFeatureCounts.py @@ -16,4 +16,4 @@ def test_makeFeatureCounts(): assert os.path.exists(os.path.join( data_output_path, 'Q-Y5F6_1M.se.countTable.csv')) assert os.path.exists(os.path.join( - data_output_path, 'Q-Y5F6_1M.se.tpmTable.csv')) + data_output_path, 'Q-Y5F6_1M.se_tpmTable.csv'))