Skip to content
Snippets Groups Projects
Commit b26a4ffb authored by nservant's avatar nservant
Browse files

[BUG] Fix in rm_dup

parent c5ae57db
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ...@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
* Update conda environment file * Update conda environment file
* Update python scripts for python3 * Update python scripts for python3
### `Fixed`
* Fix a bug in rm_dup in file sorting
### `Deprecated` ### `Deprecated`
* --skipMaps, --skipIce, --skipCool, --skipMultiQC are deprecated and replaced by --skip_maps, --skip_ice, --skip_cool, --skip_multiqc * --skipMaps, --skipIce, --skipCool, --skipMultiQC are deprecated and replaced by --skip_maps, --skip_ice, --skip_cool, --skip_multiqc
......
...@@ -650,8 +650,10 @@ if (!params.dnase){ ...@@ -650,8 +650,10 @@ if (!params.dnase){
if ("$params.min_restriction_fragment_size".isInteger()) opts="${opts} -t ${params.min_restriction_fragment_size}" if ("$params.min_restriction_fragment_size".isInteger()) opts="${opts} -t ${params.min_restriction_fragment_size}"
if ("$params.max_restriction_fragment_size".isInteger()) opts="${opts} -m ${params.max_restriction_fragment_size}" if ("$params.max_restriction_fragment_size".isInteger()) opts="${opts} -m ${params.max_restriction_fragment_size}"
if (params.save_interaction_bam) opts="${opts} --sam" if (params.save_interaction_bam) opts="${opts} --sam"
prefix = pe_bam.toString() - ~/.bam/
""" """
mapped_2hic_fragments.py -f ${frag_file} -r ${pe_bam} --all ${opts} mapped_2hic_fragments.py -f ${frag_file} -r ${pe_bam} --all ${opts}
sort -T /tmp/ -k2,2V -k3,3n -k5,5V -k6,6n -o ${prefix}.validPairs ${prefix}.validPairs
""" """
} }
} }
...@@ -677,8 +679,10 @@ else{ ...@@ -677,8 +679,10 @@ else{
def opts = "" def opts = ""
if ("$params.min_cis_dist".isInteger()) opts="${opts} -d ${params.min_cis_dist}" if ("$params.min_cis_dist".isInteger()) opts="${opts} -d ${params.min_cis_dist}"
prefix = pe_bam.toString() - ~/.bam/
""" """
mapped_2hic_dnase.py -r ${pe_bam} ${opts} mapped_2hic_dnase.py -r ${pe_bam} ${opts}
sort -T /tmp/ -k2,2V -k3,3n -k5,5V -k6,6n -o ${prefix}.validPairs ${prefix}.validPairs
""" """
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment