--- yoda/techmodel/PhysEndRunReader.cpp 2006/02/07 17:11:09 6.0 +++ yoda/techmodel/PhysEndRunReader.cpp 2006/08/16 13:15:23 6.3 @@ -1,21 +1,11 @@ - // Implementation of the PhysEndRunReader class. - -#define UINT unsigned int -#define BYTE unsigned char -#include -#include extern "C" { -#include #include "CRC.h" } -#include -#include "stdio.h" #include "ReaderAlgorithms.h" -using namespace pamela; using namespace pamela::techmodel; static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.PhysEndRunReader")); @@ -34,7 +24,7 @@ */ std::string PhysEndRunReader::GetVersionInfo(void) const { return - "$Header: /home/cvsmanager/yoda/techmodel/PhysEndRunReader.cpp,v 5.1 2006/02/04 12:37:45 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/PhysEndRunReader.cpp,v 6.2 2006/05/30 19:10:03 kusanagi Exp $\n"; } /** @@ -62,13 +52,14 @@ //physEndRun->TB_ENDRUN; InputFile->read(subData, sizeof(subData)); - subCRC = CM_Compute_CRC16(0, (UINT8*)subData, dataLength); + subCRC = CM_Compute_CRC16(0, (BYTE*)&subData, dataLength); readCRC = (((UINT16)(subData[length - 2]<<8))&0xFF00) + (((UINT16)subData[length - 1])&0x00FF); //if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for PhysEndRun Packet "); + /* if (subCRC != readCRC) { logger->error(" Wrong CRC for PhysEndRun Packet but I process it anyway"); - } + }*/ //--------------- CALO SECTION------------------------------------ long int offset = 0; int j = 0;