--- yoda/techmodel/S4InitReader.cpp 2006/02/07 17:11:10 6.0 +++ yoda/techmodel/S4InitReader.cpp 2006/05/30 19:10:02 6.1 @@ -1,21 +1,7 @@ // Implementation of the S4InitReader 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.S4InitReader")); @@ -50,7 +36,9 @@ /** * Unpack the S4Init event from an input file. */ -void S4InitReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){ - +void S4InitReader::RunEvent(int EventNumber, long int dataLength) throw (WrongCRCException){ + char subData[dataLength]; + InputFile->read(subData, sizeof(subData)); + s4Init->s4InitData = new TArrayC(dataLength, subData); }