Skip to content

Commit

Permalink
Rename deduplication to dedoublet
Browse files Browse the repository at this point in the history
  • Loading branch information
nictru committed Jan 29, 2024
1 parent c10028b commit 7d0484c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ include { MERGE } from "./modules/merge.nf"
include { PREPROCESSING } from "./workflows/preprocessing.nf"
include { COUNTS } from "./workflows/counts.nf"
include { INTEGRATION } from "./workflows/integration.nf"
include { DEDUPLICATION } from "./workflows/deduplication.nf"
include { DOUBLETS } from "./workflows/doublets.nf"
include { CLUSTERING } from "./workflows/clustering.nf"

if (params.samplesheet) { ch_samplesheet = file(params.samplesheet) } else { exit 1, 'Samplesheet not specified!' }
Expand Down Expand Up @@ -44,7 +44,7 @@ workflow {
Channel.value(params.benchmark_hvgs)
)

DEDUPLICATION(
DOUBLETS(
ch_hvgs,
INTEGRATION.out.scanvi_model,
INTEGRATION.out.integrated,
Expand All @@ -53,22 +53,22 @@ workflow {
)

CLUSTERING(
DEDUPLICATION.out.integrations,
DOUBLETS.out.integrations,
Channel.from(params.leiden_resolutions),
CELLTYPIST.out,
Channel.value(params.entropy_initial_smoothness)
)

ch_obs = CLUSTERING.out.obs.mix(
CELL_CYCLE.out, CELLTYPIST.out, DEDUPLICATION.out.solo
CELL_CYCLE.out, CELLTYPIST.out, DOUBLETS.out.solo
)

ch_obsm = CLUSTERING.out.obsm.mix(
DEDUPLICATION.out.obsm
DOUBLETS.out.obsm
)

MERGE (
DEDUPLICATION.out.raw,
DOUBLETS.out.raw,
COUNTS.out,
ch_obsm.map{ meta, obsm -> obsm}.collect(),
ch_obs.map{ meta, obs -> obs}.collect()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
process DEDUPLICATE_ADATA {
process DEDOUBLET_ADATA {
tag "${meta.id}"
container "bigdatainbiomedicine/sc-rpy:1.0"

Expand Down
16 changes: 8 additions & 8 deletions workflows/deduplication.nf → workflows/doublets.nf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
include { SOLO } from "../modules/solo.nf"
include { DEDUPLICATE_ADATA as DEDUPLICATE_INTEGRATIONS } from "../modules/deduplicate_adata.nf"
include { DEDUPLICATE_ADATA as DEDUPLICATE_RAW } from "../modules/deduplicate_adata.nf"
include { DEDOUBLET_ADATA as DEDOUBLET_INTEGRATIONS } from "../modules/dedoublet_adata.nf"
include { DEDOUBLET_ADATA as DEDOUBLET_RAW } from "../modules/dedoublet_adata.nf"
include { EXTRACT_EMBEDDING } from "../modules/extract_embedding.nf"


workflow DEDUPLICATION {
workflow DOUBLETS {
take:
ch_hvgs
ch_scanvi_model
Expand All @@ -19,21 +19,21 @@ workflow DEDUPLICATION {
ch_batches
)

DEDUPLICATE_INTEGRATIONS(
DEDOUBLET_INTEGRATIONS(
ch_integrations,
SOLO.out
)

EXTRACT_EMBEDDING(DEDUPLICATE_INTEGRATIONS.out)
EXTRACT_EMBEDDING(DEDOUBLET_INTEGRATIONS.out)

DEDUPLICATE_RAW(
DEDOUBLET_RAW(
ch_raw,
SOLO.out
)

emit:
solo = SOLO.out
integrations = DEDUPLICATE_INTEGRATIONS.out
raw = DEDUPLICATE_RAW.out
integrations = DEDOUBLET_INTEGRATIONS.out
raw = DEDOUBLET_RAW.out
obsm = EXTRACT_EMBEDDING.out
}

0 comments on commit 7d0484c

Please sign in to comment.