--- yoda/techmodel/CalibCalPulse1Reader.cpp 2004/12/03 22:08:00 2.1 +++ yoda/techmodel/CalibCalPulse1Reader.cpp 2006/02/07 17:11:09 6.0 @@ -45,7 +45,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 5.1 2006/02/04 12:37:44 kusanagi Exp $\n"; } /** @@ -69,6 +69,7 @@ calpulse_(packetData, &dataLength, &ERROR); + calibCalPulse1->unpackError = ERROR; oss.str(""); if (ERROR != 0) { char *errmsg; @@ -76,9 +77,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 +95,6 @@ } } //----------------------------------------------------------------------------------------- - } + //} }