--- chewbacca/PamOffLineSW/physics/AnticounterReader.cpp 2008/09/23 07:20:22 1.1.1.1 +++ chewbacca/PamOffLineSW/physics/AnticounterReader.cpp 2008/09/26 19:51:43 1.2 @@ -1,7 +1,7 @@ /** @file - * $Source: /repository/PamOffLineSW/physics/AnticounterReader.cpp,v $ - * $Id: AnticounterReader.cpp,v 1.5 2008-03-05 16:52:00 messineo Exp $ - * $Author: messineo $ + * $Source: /afs/ba.infn.it/user/pamela/src/CVS/chewbacca/PamOffLineSW/physics/AnticounterReader.cpp,v $ + * $Id: AnticounterReader.cpp,v 1.1.1.1 2008/09/23 07:20:22 mocchiut Exp $ + * $Author: mocchiut $ * * Implementation of the AnticounterReader class. */ @@ -31,7 +31,7 @@ */ std::string AnticounterReader::GetVersionInfo(void) const { return - "$Header: /repository/PamOffLineSW/physics/AnticounterReader.cpp,v 1.5 2008-03-05 16:52:00 messineo Exp $"; + "$Header: /afs/ba.infn.it/user/pamela/src/CVS/chewbacca/PamOffLineSW/physics/AnticounterReader.cpp,v 1.1.1.1 2008/09/23 07:20:22 mocchiut Exp $"; } /** @@ -65,30 +65,33 @@ anticounter->unpackError = ACphysics(length, (unsigned char*) data, output); oss.str(""); - switch (anticounter->unpackError){ + UInt_t uerr = anticounter->unpackError; + switch (uerr){ case 0xFF: - oss << "Anticounter unpacking: " << "data (physics or calibration) from both cards found"; - //msg=oss.str(); - //PamOffLineSW::mainLogUtil->logAll(msg); - break; + // oss << "Anticounter unpacking: " << "data (physics or calibration) from both cards found"; + //msg=oss.str(); + //PamOffLineSW::mainLogUtil->logAll(msg); + anticounter->unpackError = 0; + break; case 0xF0: - oss << "Anticounter unpacking: " << "only data from main card found"; - msg=oss.str(); - PamOffLineSW::mainLogUtil->logError(msg); - break; + oss << "Anticounter unpacking: " << "only data from main card found"; + msg=oss.str(); + PamOffLineSW::mainLogUtil->logError(msg); + break; case 0x0F: - oss << "Anticounter unpacking: " << "only data from extra card found"; - msg=oss.str(); - PamOffLineSW::mainLogUtil->logError(msg); - break; + oss << "Anticounter unpacking: " << "only data from extra card found"; + msg=oss.str(); + PamOffLineSW::mainLogUtil->logError(msg); + break; case 0x00: - oss << "Anticounter unpacking: " << "no data found"; - msg=oss.str(); - PamOffLineSW::mainLogUtil->logError(msg); - break; - oss << "Anticounter unpacking: " << "ANTICOUNTER ERRROR CODE UNIDENTIFIED"; - msg=oss.str(); - PamOffLineSW::mainLogUtil->logError(msg); + oss << "Anticounter unpacking: " << "no data found"; + msg=oss.str(); + PamOffLineSW::mainLogUtil->logError(msg); + anticounter->unpackError = 0xFF; + break; + oss << "Anticounter unpacking: " << "ANTICOUNTER ERRROR CODE UNIDENTIFIED"; + msg=oss.str(); + PamOffLineSW::mainLogUtil->logError(msg); }