--- yoda/techmodel/LogReader.cpp 2004/12/03 22:08:00 2.1 +++ yoda/techmodel/LogReader.cpp 2004/12/09 08:48:41 2.2 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v $ - * $Id: LogReader.cpp,v 2.0 2004/09/21 20:50:54 kusanagi Exp $ + * $Id: LogReader.cpp,v 2.1 2004/12/03 22:08:00 kusanagi Exp $ * $Author: kusanagi $ * * Implementation of the LogReader class. @@ -41,7 +41,7 @@ */ std::string LogReader::GetVersionInfo(void) const { return - "$Header: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v 2.0 2004/09/21 20:50:54 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v 2.1 2004/12/03 22:08:00 kusanagi Exp $\n"; } /** @@ -74,19 +74,19 @@ //took the final CRC to compare it with the previous calculated CRC of the data InputFile->read(eventCRC, sizeof(eventCRC)); readCRC = (((UINT16)(eventCRC[0]<<8))&0xFF00) + (((UINT16)eventCRC[1])&0x00FF); - - if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for RunTrailer Packet "); + Log->COMPILATION_TIMESTAMP = (((UINT32)subData[0]<<24)&0xFF000000) + (((UINT32)subData[1]<<16)&0x00FF0000) + (((UINT32)subData[2]<<8)&0x0000FF00) + (((UINT32)subData[3])&0x000000FF); - LogRecord* rec; - long int offset = 0; + long int offset = 4; int i = 0; + LogRecord* rec; Log->Records->Clear(); TClonesArray &recs = *(Log->Records); + while (offset < dataLength){ rec = new(recs[i++]) LogRecord(); //add a new Log rec->RECORD_OBT = (((UINT32)subData[offset]<<24)&0xFF000000) + (((UINT32)subData[offset+1]<<16)&0x00FF0000) + (((UINT32)subData[offset+2]<<8)&0x0000FF00) + (((UINT32)subData[offset+3])&0x000000FF); - rec->MASKTYPE = (((UINT8)subData[offset+4]<<8)&0xFF); - rec->FILE_ID = (((UINT8)subData[offset+5]<<8)&0xFF); + rec->MASKTYPE = (((UINT8)subData[offset+4])&0xFF); + rec->FILE_ID = (((UINT8)subData[offset+5])&0xFF); rec->LINE_NO = ((((UINT16)subData[offset+6]<<8)&0xFF00) + (((UINT16)subData[offset+7])&0x00FF)); rec->INFO1 = (((UINT32)subData[offset+8]<<24)&0xFF000000) + (((UINT32)subData[offset+9]<<16)&0x00FF0000) + (((UINT32)subData[offset+10]<<8)&0x0000FF00) + (((UINT32)subData[offset+11])&0x000000FF); offset = offset + 12;