--- yoda/techmodel/CalibTrailerReader.cpp 2004/08/19 15:24:46 1.1 +++ yoda/techmodel/CalibTrailerReader.cpp 2005/03/04 15:54:11 3.0 @@ -5,7 +5,7 @@ #define UINT unsigned int #define BYTE unsigned char #include -#include +#include extern "C" { #include #include "CRC.h" @@ -20,16 +20,14 @@ using namespace pamela; using namespace pamela::techmodel; -static log4cpp::Category& cat = log4cpp::Category::getInstance("pamela.techmodel.CalibTrailerReader"); +static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.CalibTrk1Reader")); /** * Constructor. */ CalibTrailerReader::CalibTrailerReader(void): TechmodelAlgorithm(PacketType::CalibTrailer, "TechmodelCalibTrailerReader") { - cat << log4cpp::Priority::DEBUG - << "Constructor " - << "\n " << log4cpp::CategoryStream::ENDLINE; + logger->debug(_T("Constructor")); calibTrailer = new CalibTrailerEvent(); } @@ -46,6 +44,7 @@ * event reader routines for all packet types. */ void CalibTrailerReader::Init(PamelaRun *run) { + logger->debug(_T("Initialize")); SetInputStream(run); run->WriteSubPacket(this, &calibTrailer, calibTrailer->Class()); } @@ -53,7 +52,7 @@ /** * Unpack the CalibTrailer event from an input file. */ -void CalibTrailerReader::RunEvent(int EventNumber, long int length) { +void CalibTrailerReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){ }