Commit edebc038 by iowa\vhorosewski

*** empty log message ***

parent d3ccbace
......@@ -2,7 +2,7 @@
///
// DAQ low level IO Library
//
// $Id: DaqFileIO.cxx,v 1.18 2011/10/06 21:53:56 iowa\dheitbri Exp $
// $Id: DaqFileIO.cxx,v 1.19 2011/10/07 20:48:06 iowa\vhorosewski Exp $
// Date: March, 2005
// Author: Yiannis Papelis
//
......@@ -1754,13 +1754,15 @@ CDaqLowLevelIo::GetFullData(
bool diffChan = chInf.GetCapRate() < 0;
const void* pSrc = latestData[idx].GetDataPtr();
if ( diffChan && (option & eEXPAND_DIFFERENTIAL) ) {
userDataStorage[idx].Append(pSrc, size, chInf.GetItemCount());
if ( pFrmList) (*pFrmList)[idx].push_back(curFrame);
}
else if ( !diffChan && gotData[(*pChnList)[idx]] ) {
userDataStorage[idx].Append(pSrc, size, chInf.GetItemCount());
if ( pFrmList) (*pFrmList)[idx].push_back(curFrame);
if (pSrc) {
if ( diffChan && (option & eEXPAND_DIFFERENTIAL) ) {
userDataStorage[idx].Append(pSrc, size, chInf.GetItemCount());
if ( pFrmList) (*pFrmList)[idx].push_back(curFrame);
}
else if ( !diffChan && gotData[(*pChnList)[idx]] ) {
userDataStorage[idx].Append(pSrc, size, chInf.GetItemCount());
if ( pFrmList) (*pFrmList)[idx].push_back(curFrame);
}
}
}
}
......
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