--- yoda/techmodel/CalibTofReader.cpp 2006/02/04 12:37:44 5.1 +++ yoda/techmodel/CalibTofReader.cpp 2006/05/30 19:10:03 6.2 @@ -1,29 +1,16 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/CalibTofReader.cpp,v $ - * $Id: CalibTofReader.cpp,v 5.0 2005/08/29 09:46:13 Maurizio Nagni Exp $ - * $Author: Maurizio Nagni $ + * $Id: CalibTofReader.cpp,v 6.1 2006/05/30 19:10:01 kusanagi Exp $ + * $Author: kusanagi $ * * Implementation of the LogReader class. * ToBeDone: * 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/CalibTofEvent.h" - -using namespace pamela; using namespace pamela::techmodel; static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.CalibTofReader")); @@ -34,7 +21,7 @@ CalibTofReader::CalibTofReader(void): TechmodelAlgorithm(PacketType::Log, "TechmodelCalibTofReader") { logger->debug(_T("Constructor")); - CalibTof = new CalibTofEvent(); + calibTof = new CalibTofEvent(); } /** @@ -42,7 +29,7 @@ */ std::string CalibTofReader::GetVersionInfo(void) const { return - "$Header: /home/cvsmanager/yoda/techmodel/CalibTofReader.cpp,v 5.0 2005/08/29 09:46:13 Maurizio Nagni Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/CalibTofReader.cpp,v 6.1 2006/05/30 19:10:01 kusanagi Exp $\n"; } /** @@ -52,14 +39,15 @@ void CalibTofReader::Init(PamelaRun *run) { logger->debug(_T("Initialize")); SetInputStream(run); - run->WriteSubPacket(this, &CalibTof, CalibTof->Class()); + run->WriteSubPacket(this, &calibTof, calibTof->Class()); } /** * Unpack the CalibTof event from an input file. */ -void CalibTofReader::RunEvent(int EventNumber, long int length) throw (Exception){ - - +void CalibTofReader::RunEvent(int EventNumber, long int dataLength) throw (Exception){ + char subData[dataLength]; + InputFile->read(subData, sizeof(subData)); + calibTof->calibTofData = new TArrayC(dataLength, subData); }