diff --git a/tools/minimap2/macros.xml b/tools/minimap2/macros.xml index 4aee57f3a07..ef9e9fa7b26 100644 --- a/tools/minimap2/macros.xml +++ b/tools/minimap2/macros.xml @@ -1,7 +1,7 @@ - 2.28 - 2 - 24.0 + 2.30 + 0 + 24.1 topic_0102 @@ -13,21 +13,20 @@ minimap2 - samtools + samtools - + - 10.1093/bioinformatics/btp324 - 10.1093/bioinformatics/btp698 10.1093/bioinformatics/bty191 + 10.1093/bioinformatics/btp352 diff --git a/tools/minimap2/minimap2.xml b/tools/minimap2/minimap2.xml index e8e7650667c..30d6f0da955 100644 --- a/tools/minimap2/minimap2.xml +++ b/tools/minimap2/minimap2.xml @@ -15,6 +15,16 @@ minimap2 --version - - - - + + + + + - - - - - - + + + + + + + @@ -230,7 +293,7 @@ -
+
- + + ^\s*(\d+(,\d+)?\s*)?$ + + + + + + + + +
-
+
+ + + + + @@ -311,12 +393,25 @@ help="Score bonus for a splice donor or acceptor found in annotation." /> + + + + + + + label="Minimal peak DP alignment score" help="default=40"/> + + + + + +
-
+
@@ -357,6 +464,11 @@ + + + + +
diff --git a/tools/minimap2/test-data/minimap2-self-homology.bam b/tools/minimap2/test-data/minimap2-self-homology.bam index 30eabfd9727..b13b903cea4 100644 Binary files a/tools/minimap2/test-data/minimap2-self-homology.bam and b/tools/minimap2/test-data/minimap2-self-homology.bam differ diff --git a/tools/minimap2/test-data/minimap2-test-kmer_ocurrence.bam b/tools/minimap2/test-data/minimap2-test-kmer_ocurrence.bam index bea0a316e59..99c6cfff419 100644 Binary files a/tools/minimap2/test-data/minimap2-test-kmer_ocurrence.bam and b/tools/minimap2/test-data/minimap2-test-kmer_ocurrence.bam differ diff --git a/tools/minimap2/test-data/minimap2-test-mask_len.bam b/tools/minimap2/test-data/minimap2-test-mask_len.bam index 460591e48dc..8b7056f4e46 100644 Binary files a/tools/minimap2/test-data/minimap2-test-mask_len.bam and b/tools/minimap2/test-data/minimap2-test-mask_len.bam differ diff --git a/tools/minimap2/test-data/minimap2-test1-fasta.bam b/tools/minimap2/test-data/minimap2-test1-fasta.bam index cfe4fe0e4f4..2d2cc49551f 100644 Binary files a/tools/minimap2/test-data/minimap2-test1-fasta.bam and b/tools/minimap2/test-data/minimap2-test1-fasta.bam differ diff --git a/tools/minimap2/test-data/minimap2-test1-fasta.cram b/tools/minimap2/test-data/minimap2-test1-fasta.cram index 6c7f213be7d..6829bdb7bd5 100644 Binary files a/tools/minimap2/test-data/minimap2-test1-fasta.cram and b/tools/minimap2/test-data/minimap2-test1-fasta.cram differ diff --git a/tools/minimap2/test-data/minimap2-test1.bam b/tools/minimap2/test-data/minimap2-test1.bam index bd1c62c613c..e9f2ecb3e46 100644 Binary files a/tools/minimap2/test-data/minimap2-test1.bam and b/tools/minimap2/test-data/minimap2-test1.bam differ diff --git a/tools/minimap2/test-data/minimap2-test_hifi-2-fasta.bam b/tools/minimap2/test-data/minimap2-test_hifi-2-fasta.bam index 7a08633aca6..de12cf8baef 100644 Binary files a/tools/minimap2/test-data/minimap2-test_hifi-2-fasta.bam and b/tools/minimap2/test-data/minimap2-test_hifi-2-fasta.bam differ diff --git a/tools/minimap2/test-data/minimap2-test_hifi-fasta.bam b/tools/minimap2/test-data/minimap2-test_hifi-fasta.bam index 6f4d23e5532..82df5cac8a1 100644 Binary files a/tools/minimap2/test-data/minimap2-test_hifi-fasta.bam and b/tools/minimap2/test-data/minimap2-test_hifi-fasta.bam differ