--- yoda/techmodel/TmtcReader.cpp	2004/12/22 11:38:35	2.6
+++ yoda/techmodel/TmtcReader.cpp	2005/05/23 11:53:48	4.3
@@ -1,6 +1,6 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $
- * $Id: TmtcReader.cpp,v 2.5 2004/12/20 14:15:13 kusanagi Exp $
+ * $Id: TmtcReader.cpp,v 4.2 2005/05/16 15:36:33 kusanagi Exp $
  * $Author: kusanagi $
  * 
  * Implementation of the TmtcReader class.
@@ -40,7 +40,7 @@
  */
 std::string TmtcReader::GetVersionInfo(void) const {
   return 
-    "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 2.5 2004/12/20 14:15:13 kusanagi Exp $\n";
+    "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 4.2 2005/05/16 15:36:33 kusanagi Exp $\n";
 }
 
 /**
@@ -70,7 +70,6 @@
     
     UINT16    partialCRC = 0; //partial CRC updated as mcmd packet is read (to compare with the last two bytes of this event)
     UINT16    readCRC = 0;    //partial CRC updated as mcmd packet is read (to compare with the last two bytes of this event)
-    
     for(int i = 0; i < numRecords; i++) {
         start = InputFile->tellg();
         InputFile->read(subData, sizeof(subData));
@@ -84,12 +83,13 @@
             rec = new(recs[i]) TmtcRecord(); //add a new TmtcRecord
             rec->TM_RECORD_OBT            = (((UINT32)subData[0]<<24)&0xFF000000) + (((UINT32)subData[1]<<16)&0x00FF0000) +  (((UINT32)subData[2]<<8)&0x0000FF00) + (((UINT32)subData[3])&0x000000FF);
             rec->TM_DIAG_AND_BILEVEL_ACQ  = (((UINT16)subData[4]<<8)&0x0000FF00) + (((UINT16)subData[5])&0x000000FF);
-            for(int j = 0; j < 12; j++) {
-                rec->TM_TH_ANA[j]    = ((((UINT16)subData[6+j]<<8)&0xFF00) + (((UINT16)subData[7+j])&0x00FF)); //20 is the size of TM_DEA_ANA(16) + OBT(4)
+            
+            for(int j = 0; j < 16; j++) {
+                rec->TM_TH_ANA[j]    = ((((UINT16)subData[6 + 2*j]<<8)&0xFF00) + (((UINT16)subData[7 + 2*j])&0x00FF)); //20 is the size of TM_DEA_ANA(16) + OBT(4)
             }
             
             for(int j = 0; j < 6; j++) {
-                rec->TM_DEA_ANA[j]   = subData[30+j];
+                rec->TM_DEA_ANA[j]   = subData[36+j];
             }
 
         } else {