--- yoda/techmodel/TmtcReader.cpp	2004/12/03 22:08:01	2.1
+++ yoda/techmodel/TmtcReader.cpp	2004/12/09 08:48:41	2.2
@@ -1,6 +1,6 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $
- * $Id: TmtcReader.cpp,v 2.0 2004/09/21 20:50:54 kusanagi Exp $
+ * $Id: TmtcReader.cpp,v 2.1 2004/12/03 22:08:01 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.0 2004/09/21 20:50:54 kusanagi Exp $\n";
+    "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 2.1 2004/12/03 22:08:01 kusanagi Exp $\n";
 }
 
 /**
@@ -106,10 +106,10 @@
             rec->TM_RECORD_OBT = (((UINT32)subData[0]<<24)&0xFF000000) + (((UINT32)subData[1]<<16)&0x00FF0000) +  (((UINT32)subData[2]<<8)&0x0000FF00) + ((UINT32)subData[3])&0x000000FF;
 
             for(j = 0; j < 16; j++) {
-                rec->TM_DEA_ANA[j]   = (((UINT16)subData[4+j]<<8)&0xFF00) + (((UINT16)subData[5+j])&0x00FF);
+                rec->TM_DEA_ANA[j]   = subData[4+j];
                 rec->TM_DEA_ANA_P[j] = (float)(rec->TM_DEA_ANA[j]*0.02);
 
-                rec->TM_TH_ANA[j]    = subData[36+j]; //36 is the size of TM_DEA_ANA + OBT
+                rec->TM_TH_ANA[j]    = ((((UINT16)subData[20+j]<<8)&0xFF00) + (((UINT16)subData[21+j])&0x00FF)); //20 is the size of TM_DEA_ANA(16) + OBT(4)
                 rec->TM_TH_ANA_P[j]  = convert_th(rec->TM_TH_ANA[j]);
             }