From: Petr Danecek <pd3@sanger.ac.uk>
Date: Tue, 12 Jun 2012 15:18:12 +0000 (+0100)
Subject: Merge remote branch 'rq/getopt_mac'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=af97a7bdff4f0d3fec9543ce8077902f8d263ba0;hp=9f118264ea012adc21a46d7c03eaad4f9ce7d4d4;p=samtools.git

Merge remote branch 'rq/getopt_mac'
---

diff --git a/bam.h b/bam.h
index f3f37f3..95cf8fa 100644
--- a/bam.h
+++ b/bam.h
@@ -168,7 +168,6 @@ typedef struct {
   @abstract Structure for core alignment information.
   @field  tid     chromosome ID, defined by bam_header_t
   @field  pos     0-based leftmost coordinate
-  @field  strand  strand; 0 for forward and 1 otherwise
   @field  bin     bin calculated by bam_reg2bin()
   @field  qual    mapping quality
   @field  l_qname length of the query name
@@ -193,13 +192,15 @@ typedef struct {
   @field  l_aux      length of auxiliary data
   @field  data_len   current length of bam1_t::data
   @field  m_data     maximum length of bam1_t::data
-  @field  data       all variable-length data, concatenated; structure: cigar-qname-seq-qual-aux
+  @field  data       all variable-length data, concatenated; structure: qname-cigar-seq-qual-aux
 
   @discussion Notes:
  
    1. qname is zero tailing and core.l_qname includes the tailing '\0'.
    2. l_qseq is calculated from the total length of an alignment block
       on reading or from CIGAR.
+   3. cigar data is encoded 4 bytes per CIGAR operation.
+   4. seq is nybble-encoded according to bam_nt16_table.
  */
 typedef struct {
 	bam1_core_t core;