--- yoda/techmodel/CalibCalPulse1Reader.cpp 2005/02/09 22:20:48 2.3 +++ yoda/techmodel/CalibCalPulse1Reader.cpp 2006/09/29 10:19:19 6.3 @@ -2,10 +2,6 @@ // Implementation of the CalibCalPulse1Reader class. -#define UINT unsigned int -#define BYTE unsigned char -#include -#include 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 -#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.2 2005/01/13 14:48:04 kusanagi Exp $\n"; + "$Header: /afs/ba.infn.it/user/pamela/src/CVS/yoda/techmodel/CalibCalPulse1Reader.cpp,v 6.2 2006/05/30 19:10:03 kusanagi Exp $\n"; } /** @@ -65,6 +56,7 @@ std::stringstream oss; char packetData[dataLength]; int ERROR; + memset(packetData, 0, dataLength*sizeof(char)); InputFile->read(packetData, sizeof(packetData)); calpulse_(packetData, &dataLength, &ERROR); @@ -79,7 +71,7 @@ oss << "Fortran77 function calpulse error code = " << ERROR << " " << 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)); @@ -95,6 +87,6 @@ } } //----------------------------------------------------------------------------------------- - } + //} }