--- yoda/techmodel/CalibTofReader.cpp 2004/07/06 12:20:23 1.1 +++ yoda/techmodel/CalibTofReader.cpp 2005/03/06 04:33:02 4.0 @@ -1,7 +1,7 @@ /** @file - * $Source: /home/cvspamela/yoda/techmodel/CalibTofReader.cpp,v $ - * $Id: CalibTofReader.cpp,v 1.1 2004/05/11 10:12:35 nagni Exp $ - * $Author: nagni $ + * $Source: /home/cvsmanager/yoda/techmodel/CalibTofReader.cpp,v $ + * $Id: CalibTofReader.cpp,v 3.0 2005/03/04 15:54:11 kusanagi Exp $ + * $Author: kusanagi $ * * Implementation of the LogReader class. * ToBeDone: @@ -11,7 +11,7 @@ #define UINT unsigned int #define BYTE unsigned char #include -#include +#include extern "C" { #include #include "CRC.h" @@ -26,16 +26,14 @@ using namespace pamela; using namespace pamela::techmodel; -static log4cpp::Category& cat = log4cpp::Category::getInstance("pamela.techmodel.CalibTofReader"); +static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.CalibTofReader")); /** * Constructor. */ CalibTofReader::CalibTofReader(void): TechmodelAlgorithm(PacketType::Log, "TechmodelCalibTofReader") { - cat << log4cpp::Priority::DEBUG - << "Constructor " - << "\n " << log4cpp::CategoryStream::ENDLINE; + logger->debug(_T("Constructor")); CalibTof = new CalibTofEvent(); } @@ -44,7 +42,7 @@ */ std::string CalibTofReader::GetVersionInfo(void) const { return - "$Header: /home/cvspamela/yoda/techmodel/CalibTofReader.cpp,v 1.1 2004/05/11 10:12:35 nagni Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/CalibTofReader.cpp,v 3.0 2005/03/04 15:54:11 kusanagi Exp $\n"; } /** @@ -52,6 +50,7 @@ * event reader routines for all packet types. */ void CalibTofReader::Init(PamelaRun *run) { + logger->debug(_T("Initialize")); SetInputStream(run); run->WriteSubPacket(this, &CalibTof, CalibTof->Class()); } @@ -59,7 +58,7 @@ /** * Unpack the CalibTof event from an input file. */ -void CalibTofReader::RunEvent(int EventNumber, long int length) { +void CalibTofReader::RunEvent(int EventNumber, long int length) throw (Exception){ }