Commit 8136a7b3 authored by thomas.forbriger's avatar thomas.forbriger Committed by thomas.forbriger
Browse files

correction

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.


SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 2163
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent 6aa4f5ad
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: mseed.cc,v 1.10 2006-04-26 15:03:00 tforb Exp $
* $Id: mseed.cc,v 1.11 2006-07-24 13:52:27 tforb Exp $
* \author Thomas Forbriger
* \date 15/07/2004
*
......@@ -29,13 +29,15 @@
*
* REVISIONS and CHANGES
* - 15/07/2004 V1.0 Thomas Forbriger
* - 24/07/2006 V1.1 reading function was not comparing record start
* time against expected record start time
*
* ============================================================================
*/
#define TF_MSEED_CC_VERSION \
"TF_MSEED_CC V1.0 "
"TF_MSEED_CC V1.1"
#define TF_MSEED_CC_CVSID \
"$Id: mseed.cc,v 1.10 2006-04-26 15:03:00 tforb Exp $"
"$Id: mseed.cc,v 1.11 2006-07-24 13:52:27 tforb Exp $"
#include <datreadxx/util.h>
#include <datreadxx/mseed.h>
......@@ -124,7 +126,16 @@ namespace datread {
// extract header
sff::WID2 wid2line=Mrecord.wid2;
sff::WID2compare wid2areequal;
sff::WID2compare wid2areequal(sff::Fdate
| sff::Fstation
| sff::Fchannel
| sff::Fauxid
| sff::Fdt
| sff::Fcalib
| sff::Fcalper
| sff::Finstype
| sff::Fhang
| sff::Fvang);
// collect data
TFXX_debug(Mdebug, "imseedstream::read", "collect data");
......@@ -146,11 +157,22 @@ namespace datread {
TFXX_debug(Mdebug, "imseedstream::read", "read next");
Mis >> Mrecord;
TFXX_debug(Mdebug, "imseedstream::read", "compare next");
TFXX_debug(Mdebug, "imseedstream::read", "expected wid2: " <<
nextwid2.line());
TFXX_debug(Mdebug, "imseedstream::read", " this wid2: " <<
Mrecord.wid2.line());
if (Mrecord.valid)
{
if (! (wid2areequal(Mrecord.wid2, nextwid2) && (xm1 == Mrecord.xm1)))
{ contiguous=false; }
nextwid2.date=sff::wid2nextdate(nextwid2);
{
contiguous=false;
TFXX_debug(Mdebug, "imseedstream::read", "non-contiguous data");
}
else
{
TFXX_debug(Mdebug, "imseedstream::read", "data is still contiguous");
}
nextwid2.date=sff::wid2nextdate(Mrecord.wid2);
}
else
{
......
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