--- yoda/techmodel/CalAlarmReader.cpp 2005/05/28 10:44:10 4.4 +++ yoda/techmodel/CalAlarmReader.cpp 2006/02/07 10:36:43 5.2 @@ -1,20 +1,8 @@ // Implementation of the CalAlarmReader class. - -#define UINT unsigned int -#define BYTE unsigned char -#include -#include -extern "C" { -#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.CalAlarmReader")); @@ -33,7 +21,7 @@ */ std::string CalAlarmReader::GetVersionInfo(void) const { return - "$Trailer: /home/cvsmanager/yoda/techmodel/CalAlarmReader.cpp,v 1.1.1.1 2004/07/06 12:20:23 kusanagi Exp $\n"; + "$Trailer: /opt/cvsmanager/yoda/techmodel/CalAlarmReader.cpp,v 1.1.1.1 2004/07/06 12:20:23 Maurizio Nagni Exp $\n"; } /** @@ -48,9 +36,13 @@ /** * Unpack the CalAlarm event from an input file. + * The CPU does not add any CRC control at the packet end. + * @param EventNumber + * @param dataLength */ -void CalAlarmReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){ - - +void CalAlarmReader::RunEvent(int EventNumber, long int dataLength) throw (WrongCRCException){ + char subData[dataLength]; + InputFile->read(subData, sizeof(subData)); + calAlarm->calAlarmData = new TArrayC(dataLength, subData); }