Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the bug in the filtering of multiple PacBio files #78

Merged
merged 4 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [[1.1.3](https://github.com/sanger-tol/readmapping/releases/tag/1.1.3)] - Shang Tang (patch 2) - [2024-05-24]
muffato marked this conversation as resolved.
Show resolved Hide resolved

### Enhancements & fixes

- Fixed the bug in the filtering of multiple PacBio files

## [[1.1.2](https://github.com/sanger-tol/variantcalling/releases/tag/1.1.2)] - Shang Tang (patch 2) - [2024-03-14]

### Enhancements & fixes
Expand Down
4 changes: 2 additions & 2 deletions modules/local/pacbio_filter.nf
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ process PACBIO_FILTER {
tuple val(meta), path(txt)

output:
path("*.blocklist"), emit: list
path "versions.yml", emit: versions
tuple val(meta), path("*.blocklist"), emit: list
path "versions.yml" , emit: versions

when:
task.ext.when == null || task.ext.when
Expand Down
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ manifest {
description = """Variant calling pipeline for PacBio data using DeepVariant"""
mainScript = 'main.nf'
nextflowVersion = '!>=22.10.1'
version = '1.1.2'
version = '1.1.3'
doi = 'https://doi.org/10.5281/zenodo.7890527'
}

Expand Down
11 changes: 10 additions & 1 deletion subworkflows/local/filter_pacbio.nf
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,18 @@ workflow FILTER_PACBIO {
// Create filtered BAM file
SAMTOOLS_CONVERT.out.bam
| join ( SAMTOOLS_CONVERT.out.csi )
| join ( PACBIO_FILTER.out.list )
| set { ch_reads_and_list }

ch_reads_and_list
| map { meta, bam, csi, list -> [meta, bam, csi] }
| set { ch_reads }

SAMTOOLS_FILTER ( ch_reads, [ [], [] ], PACBIO_FILTER.out.list )
ch_reads_and_list
| map { meta, bam, csi, list -> list }
| set { ch_lists }

SAMTOOLS_FILTER ( ch_reads, [ [], [] ], ch_lists )
ch_versions = ch_versions.mix ( SAMTOOLS_FILTER.out.versions.first() )


Expand Down
Loading