--- yoda/techmodel/LogReader.cpp 2005/08/29 09:29:03 4.5 +++ yoda/techmodel/LogReader.cpp 2006/09/29 10:19:24 6.3 @@ -1,6 +1,6 @@ /** @file - * $Source: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v $ - * $Id: LogReader.cpp,v 4.4 2005/05/28 10:44:11 kusanagi Exp $ + * $Source: /afs/ba.infn.it/user/pamela/src/CVS/yoda/techmodel/LogReader.cpp,v $ + * $Id: LogReader.cpp,v 6.2 2006/05/30 19:10:03 kusanagi Exp $ * $Author: kusanagi $ * * Implementation of the LogReader class. @@ -8,21 +8,11 @@ * Control the CRC for the entire data Packet not just for single records */ -#define UINT unsigned int -#define BYTE unsigned char -#include -#include extern "C" { -#include #include "CRC.h" } - -#include -#include "stdio.h" #include "ReaderAlgorithms.h" -#include "event/log/LogRecord.h" -using namespace pamela; using namespace pamela::techmodel; static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.LogReader")); @@ -41,7 +31,7 @@ */ std::string LogReader::GetVersionInfo(void) const { return - "$Header: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v 4.4 2005/05/28 10:44:11 kusanagi Exp $\n"; + "$Header: /afs/ba.infn.it/user/pamela/src/CVS/yoda/techmodel/LogReader.cpp,v 6.2 2006/05/30 19:10:03 kusanagi Exp $\n"; } /** @@ -63,7 +53,7 @@ UINT16 subCRC; //calculated CRC of the data UINT16 readCRC; //CRC read from the end of the subpacket long int dataLength = length - 2; //the block of data - + memset(subData, 0, length*sizeof(char)); InputFile->read(subData, sizeof(subData)); subCRC = CM_Compute_CRC16(0, (UINT8*)subData, dataLength);