From: <ro...@us...> - 2007-11-07 13:23:30
|
Revision: 1631 http://nscldaq.svn.sourceforge.net/nscldaq/?rev=1631&view=rev Author: ron-fox Date: 2007-11-07 05:23:34 -0800 (Wed, 07 Nov 2007) Log Message: ----------- Format adjustments (indentation of eclipse vs. emacs). Modified Paths: -------------- trunk/clients/assembler/InputStageCommand.cpp Modified: trunk/clients/assembler/InputStageCommand.cpp =================================================================== --- trunk/clients/assembler/InputStageCommand.cpp 2007-11-07 12:03:25 UTC (rev 1630) +++ trunk/clients/assembler/InputStageCommand.cpp 2007-11-07 13:23:34 UTC (rev 1631) @@ -436,78 +436,78 @@ */ int InputStageCommand::inject(CTCLInterpreter& interp, - std::vector<CTCLObject>& objv) + std::vector<CTCLObject>& objv) { - // Check the preconditions: - - if (!m_pInputStage) { - return AssemblerErrors::setErrorMsg(interp, - AssemblerErrors::DoesNotExist, - "(InputStage)"); - } - if (!m_pInputStage->isRunning()) { - return AssemblerErrors::setErrorMsg(interp, - AssemblerErrors::Stopped, - "(InputStage)"); - } - // The Buffer must at least be a full buffer: - - objv[2].Bind(interp); - if (objv[2].llength() < 16) { - string result; - result += "Attempting to inject and event that doesn't\n"; - result += "even have a full header. Giving up"; - interp.setResult(result); - return TCL_ERROR; - } - // Now build the buffer: - - uint16_t buffer[BUFFERSIZE]; - uint16_t* pDest(buffer); - - for (int i=0; i < objv[2].llength(); i++) { - CTCLObject bufferElement = objv[2].lindex(i); - bufferElement.Bind(interp); - // If an integer install as an integer..otherwise - // install as a string: - - try { - int value = bufferElement; - pDest = static_cast<uint16_t*>(installInt(pDest, value)); + // Check the preconditions: + + if (!m_pInputStage) { + return AssemblerErrors::setErrorMsg(interp, + AssemblerErrors::DoesNotExist, + "(InputStage)"); + } + if (!m_pInputStage->isRunning()) { + return AssemblerErrors::setErrorMsg(interp, + AssemblerErrors::Stopped, + "(InputStage)"); + } + // The Buffer must at least be a full buffer: + + objv[2].Bind(interp); + if (objv[2].llength() < 16) { + string result; + result += "Attempting to inject and event that doesn't\n"; + result += "even have a full header. Giving up"; + interp.setResult(result); + return TCL_ERROR; + } + // Now build the buffer: + + uint16_t buffer[BUFFERSIZE]; + uint16_t* pDest(buffer); + + for (int i=0; i < objv[2].llength(); i++) { + CTCLObject bufferElement = objv[2].lindex(i); + bufferElement.Bind(interp); + // If an integer install as an integer..otherwise + // install as a string: + + try { + int value = bufferElement; + pDest = static_cast<uint16_t*>(installInt(pDest, value)); + } + catch(...) { + // Not an int... + string value = bufferElement; + pDest = static_cast<uint16_t*>(installString(pDest, value)); + } - catch(...) { - // Not an int... - string value = bufferElement; - pDest = static_cast<uint16_t*>(installString(pDest, value)); - - } - } - - // Dispatch it to the right buffer processor based on type. - - uint16_t type = buffer[1]; // Buffer type... - - - try { - m_pInputStage->processBuffer(buffer); - } - catch(InvalidNodeException err) { - return AssemblerErrors::setErrorMsg(interp, - AssemblerErrors::NoSuchId, - "Injecting data"); - } - catch (EventTooSmallException err) { - return AssemblerErrors::setErrorMsg(interp, - AssemblerErrors::TooSmallForTimestamp, - "Injecting data"); - } - catch (...) { - return AssemblerErrors::setErrorMsg(interp, - AssemblerErrors::ExceptionEvent, - "InputStage threw exception on injected buffer"); - } - return TCL_OK; - + } + + // Dispatch it to the right buffer processor based on type. + + uint16_t type = buffer[1]; // Buffer type... + + + try { + m_pInputStage->processBuffer(buffer); + } + catch(InvalidNodeException err) { + return AssemblerErrors::setErrorMsg(interp, + AssemblerErrors::NoSuchId, + "Injecting data"); + } + catch (EventTooSmallException err) { + return AssemblerErrors::setErrorMsg(interp, + AssemblerErrors::TooSmallForTimestamp, + "Injecting data"); + } + catch (...) { + return AssemblerErrors::setErrorMsg(interp, + AssemblerErrors::ExceptionEvent, + "InputStage threw exception on injected buffer"); + } + return TCL_OK; + } //////////////////////////////////////////////////////////////// /*! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |