diff --git a/bin/dashboard_mappingstats.py b/bin/dashboard_mappingstats.py old mode 100644 new mode 100755 diff --git a/bin/generate_dashboard.py b/bin/generate_dashboard.py index 46443e0..015bc55 100755 --- a/bin/generate_dashboard.py +++ b/bin/generate_dashboard.py @@ -505,6 +505,10 @@ def get_val(source: Dict[str, Any], key: str, default: str = "N/A") -> Any: else: # alevin-fry fallback: require at least one of meta_info or quant.json to proceed + af_meta_file = find_file_for_sample(s_id, args.af_meta_info) + af_quant_file = find_file_for_sample(s_id, args.af_quant_json) + af_cell_meta_file = find_file_for_sample(s_id, args.af_cell_meta) + af_meta = _safe_read_json(af_meta_file) af_quant = _safe_read_json(af_quant_file) af_cell = parse_cell_meta_tsv(af_cell_meta_file) diff --git a/modules/local/tools/10x_saturate/plot_curve/main.nf b/modules/local/tools/10x_saturate/plot_curve/main.nf index 69502b6..01e2d12 100644 --- a/modules/local/tools/10x_saturate/plot_curve/main.nf +++ b/modules/local/tools/10x_saturate/plot_curve/main.nf @@ -1,7 +1,7 @@ process SATURATION_PLOT { publishDir "${params.outdir}/saturation/${meta.id}", mode: 'copy' tag "${meta.id}" - label 'process_single' + label 'process_medium' conda "${moduleDir}/environment.yml" container "oras://community.wave.seqera.io/library/pysam_samtools_matplotlib_numpy_pruned:b8f551e4a5153343" diff --git a/modules/local/tools/10x_saturate/saturation_table/main.nf b/modules/local/tools/10x_saturate/saturation_table/main.nf index 1b9e92f..e9741cc 100644 --- a/modules/local/tools/10x_saturate/saturation_table/main.nf +++ b/modules/local/tools/10x_saturate/saturation_table/main.nf @@ -1,7 +1,7 @@ process SATURATION_TABLE { publishDir "${params.outdir}/saturation/${meta.id}", mode: 'copy' tag "${meta.id}" - label 'process_single' + label 'process_medium' conda "${moduleDir}/environment.yml" container "oras://community.wave.seqera.io/library/pysam_samtools_bc_python_pruned:82a1e27e868113f0" diff --git a/modules/local/tools/kraken/kraken_classify/main.nf b/modules/local/tools/kraken/kraken_classify/main.nf index a780240..a6bae70 100644 --- a/modules/local/tools/kraken/kraken_classify/main.nf +++ b/modules/local/tools/kraken/kraken_classify/main.nf @@ -29,7 +29,7 @@ process KRAKEN { --report ${meta.id}_kraken_taxonomy.txt \\ --report-minimizer-data \\ --use-names \\ - --memory-mapping \ + --memory-mapping \\ --log ${meta.id}_kraken.log \\ --output ${meta.id}_kraken_output.txt \\ ${filtered_fasta} diff --git a/subworkflows/local/mapping/mapping_starsolo.nf b/subworkflows/local/mapping/mapping_starsolo.nf index 81ffa4f..0a81843 100644 --- a/subworkflows/local/mapping/mapping_starsolo.nf +++ b/subworkflows/local/mapping/mapping_starsolo.nf @@ -159,17 +159,8 @@ workflow mapping_starsolo_workflow { // Create STAR index with extended GTF STARSOLO_INDEX_GENEEXT(GENE_EXT.out, ch_first_cDNA) - // Join original data with the new sample-specific index - data_output - .join(STARSOLO_INDEX_GENEEXT.out) - .multiMap { meta, f_cdna, f_umi, empty, sheet, index -> - data_ch: [meta, f_cdna, f_umi, empty, sheet] - index_ch: [meta, index] - } - .set { ch_remap_inputs } - // Remap with STARsolo using the extended GTF - STARSOLO_ALIGN_GENEEXT(ch_remap_inputs.data_ch, bc_whitelist, ch_remap_inputs.index_ch) + STARSOLO_ALIGN_GENEEXT(data_output, bc_whitelist, STARSOLO_INDEX_GENEEXT.out) SAMTOOLS_INDEX_GENEEXT(STARSOLO_ALIGN_GENEEXT.out.bam_file) // Capture remapped STARsolo outputs