--- yoda/techmodel/TmtcReader.cpp 2005/03/07 16:29:55 4.1 +++ yoda/techmodel/TmtcReader.cpp 2005/08/29 09:46:13 5.0 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $ - * $Id: TmtcReader.cpp,v 4.0 2005/03/06 04:33:02 kusanagi Exp $ + * $Id: TmtcReader.cpp,v 4.4 2005/05/23 13:53:43 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 4.0 2005/03/06 04:33:02 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 4.4 2005/05/23 13:53:43 kusanagi Exp $\n"; } /** @@ -84,12 +84,12 @@ 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++) { + 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[38+j]; } } else {