Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LBMC
Hub
hic
Commits
e2783e11
Commit
e2783e11
authored
3 years ago
by
nservant
Browse files
Options
Downloads
Patches
Plain Diff
[BUG] in file export
parent
ace27ad5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
main.nf
+10
-8
10 additions, 8 deletions
main.nf
with
11 additions
and
8 deletions
CHANGELOG.md
+
1
−
0
View file @
e2783e11
...
...
@@ -5,6 +5,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## v1.3.0dev
*
Fix bug in stats export
*
Change the /tmp/ folder by ./tmp/ folder so that all tmp files are now in the work (#24)
*
Add
`--hicpro_maps`
options to generate the raw and normalized HiC-Pro maps. The default is now to use cooler
*
Add HiCExplorer distance decay quality control (#54)
...
...
This diff is collapsed.
Click to expand it.
main.nf
+
10
−
8
View file @
e2783e11
...
...
@@ -146,7 +146,7 @@ else {
// Chromosome size
if ( params.chromosome_size ){
Channel.fromPath( params.chromosome_size , checkIfExists: true)
.into {chrsize; chrsize_build; chrsize_raw; chrsize_balance; chrsize_zoom
,
chrsize_compartments}
.into {chrsize; chrsize_build; chrsize_raw; chrsize_balance; chrsize_zoom
;
chrsize_compartments}
}
else if ( params.fasta ){
Channel.fromPath( params.fasta )
...
...
@@ -363,7 +363,7 @@ if(!params.chromosome_size && params.fasta){
file fasta from fasta_for_chromsize
output:
file "*.size" into chrsize, chrsize_build, chrsize_raw, chrsize_balance, chrsize_zoom
file "*.size" into chrsize, chrsize_build, chrsize_raw, chrsize_balance, chrsize_zoom
, chrsize_compartments
script:
"""
...
...
@@ -689,7 +689,8 @@ process remove_duplicates {
output:
set val(sample), file("*.allValidPairs") into ch_vpairs, ch_vpairs_cool
file("stats/*") into all_mergestat
file("stats/") into mqc_mergestat
file("stats/*/*") into all_mergestat
script:
if ( ! params.keep_dups ){
...
...
@@ -733,7 +734,8 @@ process merge_stats {
set val(prefix), file(fstat) from all_mapstat.groupTuple().concat(all_pairstat.groupTuple(), all_rsstat.groupTuple())
output:
file("stats/") into all_mstats
file("stats/") into mqc_mstats
file("stats/*/*") into all_mstats
script:
sample = prefix.toString() - ~/(_R1|_R2|_val_1|_val_2|_1|_2)/
...
...
@@ -959,7 +961,7 @@ process compartment_calling {
input:
set val(sample), val(res), file(cool), val(r) from chcomp
file(fasta) from fasta_for_compartments
file(fasta) from fasta_for_compartments
.collect()
file(chrsize) from chrsize_compartments.collect()
output:
...
...
@@ -969,8 +971,8 @@ process compartment_calling {
"""
cooltools genome binnify ${chrsize} ${res} > genome_bins.txt
cooltools genome gc genome_bins.txt ${fasta} > genome_gc.txt
cooltools call-compartments --reference-track
s
genome_gc.txt --contact-type cis -o ${sample}_compartments ${cool}
awk -F"\t" 'NR>1{OFS="\t"; if($6==""){$6=0}; print $1,$2,$3,$6}' ${sample
]
_compartments.cis.vecs.tsv | sort -k1,1 -k2,2n > ${sample
]
_compartments.cis.E1.bedgraph
cooltools call-compartments --reference-track genome_gc.txt --contact-type cis -o ${sample}_compartments ${cool}
awk -F"\t" 'NR>1{OFS="\t"; if(
\
$6==""){
\
$6=0}; print
\
$1,
\
$2,
\
$3,
\
$6}' ${sample
}
_compartments.cis.vecs.tsv | sort -k1,1 -k2,2n > ${sample
}
_compartments.cis.E1.bedgraph
"""
}
...
...
@@ -1049,7 +1051,7 @@ process multiqc {
input:
file multiqc_config from ch_multiqc_config
file (mqc_custom_config) from ch_multiqc_custom_config.collect().ifEmpty([])
file ('input_*/*') from
all
_mstats.concat(
all
_mergestat).collect()
file ('input_*/*') from
mqc
_mstats.concat(
mqc
_mergestat).collect()
file ('software_versions/*') from ch_software_versions_yaml
file workflow_summary from ch_workflow_summary.collect()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment