--- yoda/techmodel/CalibCalPulse1Reader.cpp	2004/12/03 22:08:00	2.1
+++ yoda/techmodel/CalibCalPulse1Reader.cpp	2006/05/30 19:10:01	6.1
@@ -2,10 +2,6 @@
 // Implementation of the CalibCalPulse1Reader class.
  
 
-#define UINT unsigned int
-#define BYTE  unsigned char
-#include <string>
-#include <log4cxx/logger.h>
 extern "C" {
 #include "CRC.h"  
     //Struct per il passaggio di dati da e verso la chiamata fortran
@@ -20,13 +16,8 @@
     void calpulse_(char*, long int*, int*);
 }
 
-#include <fstream>
-#include "stdio.h"
 #include "ReaderAlgorithms.h"
 
-#include "event/CalibCalPulse1Event.h"
-
-using namespace pamela;
 using namespace pamela::techmodel;
 
 static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.CalibCalPulse1Reader"));
@@ -45,7 +36,7 @@
  */
 std::string CalibCalPulse1Reader::GetVersionInfo(void) const {
   return 
-    "$Header: /home/cvsmanager/yoda/techmodel/CalibCalPulse1Reader.cpp,v 2.0 2004/09/21 20:50:54 kusanagi Exp $\n";
+    "$Header: /home/cvsmanager/yoda/techmodel/CalibCalPulse1Reader.cpp,v 6.0 2006/02/07 17:11:09 kusanagi Exp $\n";
 }
 
 /**
@@ -69,6 +60,7 @@
 
     calpulse_(packetData, &dataLength, &ERROR);
     
+    calibCalPulse1->unpackError = ERROR;
     oss.str("");    
     if (ERROR != 0) {
         char *errmsg;
@@ -76,9 +68,9 @@
             case 1: errmsg = "CALORIMETER NOT FOUND";
         }
         oss << "Fortran77 function calpulse error code = " << ERROR
-            <<  "\n" << errmsg;
+            <<  " " << errmsg;
         logger->warn(oss.str().c_str());
-    } else {
+    } //else {
       //Store the unpacked data
         calibCalPulse1->iev = calpul_.iev;
         memcpy(calibCalPulse1->pstwerr, calpul_.pstwerr, sizeof(calibCalPulse1->pstwerr));
@@ -94,6 +86,6 @@
             }
         }
    //-----------------------------------------------------------------------------------------
-    }
+    //}
 }