for (i = 0; i < n_types; ++i) {
ka_param_t ap = ka_param_blast;
ap.band_width = 2 * types[n_types - 1] + 2;
+ ap.gap_end = 0;
// write ref2
for (k = 0, j = left; j <= pos; ++j)
ref2[k++] = bam_nt16_nt4_table[bam_nt16_table[(int)ref[j]]];
if (ref2[x+k] != rs[y+k] && ref2[x+k] < 4) ps += bam1_qual(p->b)[y+k];
x += len; y += len;
} else if (op == BAM_CINS || op == BAM_CSOFT_CLIP) {
- if (op == BAM_CINS) ps += mi->q_indel * len;
+ if (op == BAM_CINS && l > 0 && l < n_acigar - 1) ps += mi->q_indel * len;
y += len;
} else if (op == BAM_CDEL) {
- ps += mi->q_indel * len;
+ if (l > 0 && l < n_acigar - 1) ps += mi->q_indel * len;
x += len;
}
}
d->max_depth = 0;
d->tid = -1; d->mask = BAM_DEF_MASK;
d->c = bam_maqcns_init();
+ d->c->is_soap = 1; // change the default model
d->ido = bam_maqindel_opt_init();
while ((c = getopt(argc, argv, "st:f:cT:N:r:l:d:im:gI:G:vM:S2aR:P")) >= 0) {
switch (c) {
- case 'a': d->c->is_soap = 1; break;
+ case 'a': d->c->is_soap = 0; break;
case 's': d->format |= BAM_PLF_SIMPLE; break;
case 't': fn_list = strdup(optarg); break;
case 'l': fn_pos = strdup(optarg); break;
fprintf(stderr, "Usage: samtools pileup [options] <in.bam>|<in.sam>\n\n");
fprintf(stderr, "Option: -s simple (yet incomplete) pileup format\n");
fprintf(stderr, " -S the input is in SAM\n");
- fprintf(stderr, " -a use the SOAPsnp model for SNP calling\n");
+ fprintf(stderr, " -a use the MAQ model for SNP calling\n");
fprintf(stderr, " -2 output the 2nd best call and quality\n");
fprintf(stderr, " -i only show lines/consensus with indels\n");
fprintf(stderr, " -m INT filtering reads with bits in INT [%d]\n", d->mask);
#endif
#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "0.1.7-18 (r605)"
+#define PACKAGE_VERSION "0.1.7-19 (r607)"
#endif
int bam_taf2baf(int argc, char *argv[]);