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

Sync pixelator 0.16 work into pixelator-next #2

Merged
merged 8 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
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).


## [UNRELEASED] - YYYY-MM-DD

### Changed

- `collapse` and `graph` steps output parquet files

## [[1.0.3](https://github.com/nf-core/pixelator/releases/tag/1.0.3)] - 2024-01-19

### Enhancements & fixes
Expand Down
8 changes: 3 additions & 5 deletions docs/output.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ given barcodes/antibodies.

- `collapse`

- `<sample-id>.collapsed.csv.gz`: Edgelist of the graph.
- `<sample-id>.collapsed.parquet`: Edgelist of the graph.
- `<sample-id>.report.json`: Statistics for the collapse step.
- `<sample-id>.meta.json`: Command invocation metadata.

Expand All @@ -137,10 +137,8 @@ The output format of this command is an edge list in CSV format.

- `graph`

- `<sample-id>.edgelist.csv.gz`:
Edge list dataframe (CSV) after recovering technical multiplets.
- `<sample-id>.raw_edgelist.csv.gz`:
Raw edge list dataframe in csv format before recovering technical multiplets.
- `<sample-id>.edgelist.parquet`:
Edge list dataframe after recovering technical multiplets.
- `<sample-id>.components_recovered.csv`:
List of new components recovered (when using `--multiple-recovery`)
- `<sample-id>.meta.json`: Command invocation metadata.
Expand Down
10 changes: 5 additions & 5 deletions modules/local/pixelator/single-cell/collapse/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ process PIXELATOR_COLLAPSE {
tuple val(meta), path(reads), path(panel_file), val(panel)

output:
tuple val(meta), path("collapse/*.collapsed.csv.gz"), emit: collapsed
tuple val(meta), path("collapse/*.report.json") , emit: report_json
tuple val(meta), path("collapse/*.meta.json") , emit: metadata
tuple val(meta), path("*pixelator-collapse.log") , emit: log
tuple val(meta), path("collapse/*.collapsed.parquet"), emit: collapsed
tuple val(meta), path("collapse/*.report.json") , emit: report_json
tuple val(meta), path("collapse/*.meta.json") , emit: metadata
tuple val(meta), path("*pixelator-collapse.log") , emit: log

path "versions.yml" , emit: versions
path "versions.yml" , emit: versions

when:
task.ext.when == null || task.ext.when
Expand Down
3 changes: 1 addition & 2 deletions modules/local/pixelator/single-cell/graph/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ process PIXELATOR_GRAPH {
tuple val(meta), path(edge_list)

output:
tuple val(meta), path("graph/*.edgelist.csv.gz") , emit: edgelist
tuple val(meta), path("graph/*.raw_edgelist.csv.gz") , emit: raw_edgelist
tuple val(meta), path("graph/*.edgelist.parquet") , emit: edgelist
tuple val(meta), path("graph/*.components_recovered.csv"), emit: components_recovered, optional: true
tuple val(meta), path("graph/*.report.json") , emit: report_json
tuple val(meta), path("graph/*.meta.json") , emit: input_params
Expand Down
40 changes: 33 additions & 7 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"type": "object",
"fa_icon": "fas fa-terminal",
"description": "Define where the pipeline should find input data and save output data.",
"required": ["input", "outdir"],
"required": [
"input",
"outdir"
],
"properties": {
"input": {
"type": "string",
Expand Down Expand Up @@ -147,7 +150,10 @@
"fa_icon": "fas code-fork",
"description": "The algorithm to use for collapsing (adjacency will perform error correction using the number of mismatches given)",
"default": "adjacency",
"enum": ["adjacency", "unique"],
"enum": [
"adjacency",
"unique"
],
"type": "string"
},
"max_neighbours": {
Expand Down Expand Up @@ -224,7 +230,11 @@
"dynamic_filter": {
"description": " Enable the estimation of dynamic size filters using a log-rank approach both: estimate both min and max size, min: estimate min size (--min-size), max: estimate max size (--max-size)",
"type": "string",
"enum": ["both", "min", "max"],
"enum": [
"both",
"min",
"max"
],
"default": "min"
},
"aggregate_calling": {
Expand Down Expand Up @@ -260,7 +270,11 @@
"description": "Which approach to use to normalize the antibody counts.",
"help_text": "- `raw`: use the raw counts.\n- `CLR`: use the CLR-transformed counts.\n- `denoise`: use CLR-transformed counts and subtract the counts of control antibodies",
"type": "string",
"enum": ["raw", "clr", "denoise"],
"enum": [
"raw",
"clr",
"denoise"
],
"default": "clr"
},
"polarization_binarization": {
Expand All @@ -270,7 +284,12 @@
},
"colocalization_transformation": {
"type": "string",
"enum": ["raw", "clr", "log1p", "relative"],
"enum": [
"raw",
"clr",
"log1p",
"relative"
],
"default": "log1p",
"description": "Select the type of transformation to use on the node by antibody counts matrix when computing colocalization"
},
Expand Down Expand Up @@ -424,7 +443,14 @@
"description": "Method used to save pipeline results to output directory.",
"help_text": "The Nextflow `publishDir` option specifies which intermediate files should be saved to the output directory. This option tells the pipeline what method should be used to move these files. See [Nextflow docs](https://www.nextflow.io/docs/latest/process.html#publishdir) for details.",
"fa_icon": "fas fa-copy",
"enum": ["symlink", "rellink", "link", "copy", "copyNoFollow", "move"],
"enum": [
"symlink",
"rellink",
"link",
"copy",
"copyNoFollow",
"move"
],
"hidden": true
},
"email_on_fail": {
Expand Down Expand Up @@ -533,4 +559,4 @@
"$ref": "#/definitions/generic_options"
}
]
}
}
Loading