Merge pull request #21 from loosolab/motif_estiamtion

Fixed bug caused by paramterer gtf_path

README.md

@@ -11,7 +11,7 @@ For further information read the [documentation](https://github.molgen.mpg.de/lo
 ## Installation
 Start with installing all dependencies listed above (Nextflow, conda) and downloading all files from the [GitHub repository](https://github.molgen.mpg.de/loosolab/masterJLU2018).
 
-Every other dependency will be automatically  installed by Nextflow using conda. For that a new conda enviroment will be created, which can be found in the from Nextflow created work directory after the first pipeline run. 
+Every other dependency will be automatically  installed by Nextflow using conda. For that a new conda enviroment will be created, which can be found in the from Nextflow created work directory after the first pipeline run.
 It is **not** required to create and activate the enviroment from the yaml-file beforehand.
 
 **Important Note:** For conda the channel bioconda needs to be set as highest priority! This is required due to two differnt packages with the same name in different channels. For the pipeline the package jellyfish from the channel bioconda is needed and **NOT** the jellyfisch package from the channel conda-forge!
@@ -30,14 +30,16 @@ Required arguments:
 	--genome_fasta		 Path to genome in FASTA-format
 	--motif_db		 Path to motif-database in MEME-format
 	--config		 Path to UROPA configuration file
-	--create_known_tfbs_path Path to directory where output from tfbsscan (known motifs) are stored.
-				 Path can be set as tfbs_path in next run. (Default: './')
-	--out			 Output Directory (Default: './out/')	
-	
+ 	--organism 		 Input organism [hg38 | hg19 | mm9 | mm10]
+	--out			 Output Directory (Default: './out/')
+
 Optional arguments:
-	
+
 	--help [0|1]		1 to show this help message. (Default: 0)
 	--tfbs_path 		Path to directory with output from tfbsscan. If given tfbsscan will not be run.
+	--create_known_tfbs_path Path to directory where output from tfbsscan (known motifs) are stored.
+				 Path can be set as tfbs_path in next run. (Default: './')
+	--gtf_path			Path to gtf-file. If path is set the process which creats a gtf-file is skipped.
 
 	Footprint extraction:
 	--window_length INT	This parameter sets the length of a sliding window. (Default: 200)
@@ -77,7 +79,6 @@ Optional arguments:
 	--motif_similarity_thresh FLOAT	Threshold for motif similarity score (Default: 0.00001)
 
 	Creating GTF:
-	--organism [hg38 | hg19 | mm9 | mm10]	Input organism
 	--tissues List/String 	List of one or more keywords for tissue-/category-activity, categories must be specified as in JSON
 				config
 All arguments can be set in the configuration files
@@ -103,4 +104,3 @@ path=[Path to given masterenv.yml file]
 conda env create --name masterenv -f $path
 ```
 When the enviroment is created, set the variable 'path_env' in the configuration file as the path to it.
-

pipeline.nf

@@ -9,7 +9,7 @@
 	params.tfbs_path=""
 	params.create_known_tfbs_path = "./"
 	params.help = 0
-	params.get_path=""
+	params.gtf_path=""
 	params.out = "./out/"
 
 //peak_calling
@@ -585,15 +585,15 @@ process create_GTF {
 	file ('*.gtf') into gtf
 
 	when:
-	gtf_path == ""
+	params.gtf_path == ""
 
 	script:
 	"""
 	python ${path_bin}/RegGTFExtractor.py ${params.organism} --tissue ${params.tissues} --wd ${path_bin}
 	"""
 }
 
-if (gtf_path == "") {
+if (params.gtf_path == "") {
 	gtf_for_uropa = gtf
 } else {
 	gtf_for_uropa = Channel.fromPath(params.gtf_path)