Skip to content

Commit d7859fe

Browse files
committed
Merge branch 'dev' of github.com:oist/plessy_pairwiseGenomeComparison into dev
2 parents 7911279 + cd517dd commit d7859fe

File tree

2 files changed

+29
-7
lines changed

2 files changed

+29
-7
lines changed

Diff for: conf/test.config

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ params {
2121

2222
// Input data
2323
// TODO nf-core: Specify the paths to your test data on nf-core/test-datasets
24-
// TODO nf-core: Give any required params for the test so that command line flags are not needed
25-
input = 'https://raw.githubusercontent.com/U13bs1125/test-datasets/pairgenomealign/testsamplesheet.csv'
26-
27-
//Target genome
24+
input = 'https://raw.githubusercontent.com/U13bs1125/test-datasets/pairgenomealign/testsamplesheet.csv'
25+
26+
// Target
2827
target = 'https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/genomics/sarscov2/genome/genome.fasta'
2928

3029
// Genome references

Diff for: workflows/pairalign.nf

+26-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
*/
66

77
include { ASSEMBLYSCAN } from '../modules/nf-core/assemblyscan/main'
8-
include { LAST_LASTDB } from '../modules/nf-core/last/lastdb/main'
9-
include { LAST_TRAIN } from '../modules/nf-core/last/train/main'
8+
include { LAST_DOTPLOT } from '../modules/nf-core/last/dotplot/main'
9+
include { LAST_LASTAL } from '../modules/nf-core/last/lastal/main'
10+
include { LAST_LASTDB } from '../modules/nf-core/last/lastdb/main'
11+
include { LAST_SPLIT } from '../modules/nf-core/last/split/main'
12+
include { LAST_TRAIN } from '../modules/nf-core/last/train/main'
1013
include { MULTIQC } from '../modules/nf-core/multiqc/main'
1114
include { paramsSummaryMap } from 'plugin/nf-validation'
1215
include { paramsSummaryMultiqc } from '../subworkflows/nf-core/utils_nfcore_pipeline'
@@ -50,9 +53,29 @@ workflow PAIRALIGN {
5053
//
5154
LAST_TRAIN (
5255
ch_samplesheet,
53-
LAST_LASTDB.out.index
56+
LAST_LASTDB.out.index.map { row -> row[1] } // Remove metadata map
5457
)
5558

59+
// MODULE: lastal
60+
//
61+
LAST_LASTAL (
62+
ch_samplesheet.join(LAST_TRAIN.out.param_file),
63+
LAST_LASTDB.out.index.map { row -> row[1] } // Remove metadata map
64+
)
65+
66+
// MODULE: last_split
67+
//
68+
LAST_SPLIT (
69+
LAST_LASTAL.out.maf
70+
)
71+
72+
// MODULE: last_dotplot
73+
//
74+
LAST_DOTPLOT (
75+
LAST_SPLIT.out.maf,
76+
'png'
77+
)
78+
5679
// Collate and save software versions
5780
//
5881
softwareVersionsToYAML(ch_versions)

0 commit comments

Comments
 (0)