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