Skip to content

D
DaqIOLib
Commit 81f3335f by iowa\oahmad
Options

Made slight modification to frame number reporting.

parent e2cb3f35
Showing with 6 additions and 3 deletions
DaqFileIO.cxx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/// ///
// DAQ low level IO Library // DAQ low level IO Library
// //
// $Id: DaqFileIO.cxx,v 1.16 2011/06/20 14:36:30 iowa\dheitbri Exp $ // $Id: DaqFileIO.cxx,v 1.17 2011/09/27 00:55:01 iowa\oahmad Exp $
// Date: March, 2005 // Date: March, 2005
// Author: Yiannis Papelis // Author: Yiannis Papelis
// //
...@@ -1304,7 +1304,11 @@ CDaqLowLevelIo::LowLevelDataRead( ...@@ -1304,7 +1304,11 @@ CDaqLowLevelIo::LowLevelDataRead(
memset(((char *)pTempSpace) + size, 0, fullSize - size); memset(((char *)pTempSpace) + size, 0, fullSize - size);
} }
daqBuf.Append(pTempSpace, fullSize, ch.GetItemCount()); daqBuf.Append(pTempSpace, fullSize, ch.GetItemCount());
if ( pFrameList ) (*pFrameList)[needChan[chId]].push_back(curFrame); if ( pFrameList )
{
// (*pFrameList)[needChan[chId]].push_back(curFrame);
(*pFrameList)[idx].push_back(curFrame);
}
} }
else { else {
// skip the data // skip the data
...@@ -2054,7 +2058,6 @@ CDaqLowLevelIo::ReadFrameHeader( ...@@ -2054,7 +2058,6 @@ CDaqLowLevelIo::ReadFrameHeader(
} }
return eDAQ_READ_EOF; return eDAQ_READ_EOF;
} }
// If we get here, then what we expected to be a frame header is not. // If we get here, then what we expected to be a frame header is not.
// Most likely some data didn't make it and we are out of sync with // Most likely some data didn't make it and we are out of sync with
// where things are. We will try to resynchronize by looking for // where things are. We will try to resynchronize by looking for
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment