Commit 39ea28bc authored by thomas.forbriger's avatar thomas.forbriger Committed by thomas.forbriger
Browse files

code apparently works basically

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: 2890
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent e4486413
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: tsoftdata.cc,v 1.13 2009-11-12 07:23:55 tforb Exp $
* $Id: tsoftdata.cc,v 1.14 2009-11-12 07:38:51 tforb Exp $
* \author Thomas Forbriger
* \date 16/09/2009
*
......@@ -35,7 +35,7 @@
#define DATREAD_TSOFTDATA_CC_VERSION \
"DATREAD_TSOFTDATA_CC V1.0 "
#define DATREAD_TSOFTDATA_CC_CVSID \
"$Id: tsoftdata.cc,v 1.13 2009-11-12 07:23:55 tforb Exp $"
"$Id: tsoftdata.cc,v 1.14 2009-11-12 07:38:51 tforb Exp $"
#include <datreadxx/error.h>
#include <datreadxx/tsoftdata.h>
......@@ -112,7 +112,7 @@ namespace datread {
if (I != vos.end()) { Mlocation = *I; ++I; }
if (I != vos.end()) { Minstrument = *I; ++I; }
if (I != vos.end()) { Mdatatype = *I; ++I; }
std::cout << "+++" << Mdatatype << "+++" << std::endl;
// std::cout << "+++" << Mdatatype << "+++" << std::endl;
} // Channelinfo::setchannelinfo(const std::string& line)
/*======================================================================*/
......@@ -130,7 +130,9 @@ namespace datread {
while (iss.good())
{
iss >> sample;
if (iss.good()) { Msamples.push_back(sample); }
//if (iss.good()) { Msamples.push_back(sample); }
Msamples.push_back(sample);
// std::cout << "sample " << sample << std::endl;
}
} // Dataline::Dataline(const std::string& line)
......@@ -247,10 +249,12 @@ namespace datread {
std::cout << " dt: " << dt.timestring() << std::endl;
std::cout << " undetval: " << theundetval << std::endl;
}
// std::cout << "nsamples " << thedata.nsamples() << std::endl;
for (int ich=0; ich<thedata.nsamples(); ++ich)
{
std::string thesample(thedata.sample(ich));
trimws(thesample);
// std::cout << "ich " << ich << " sample " << thesample << std::endl;
if (debug)
{
std::cout << " sample: " << thesample << std::endl;
......
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: tsoftsffcontainer.cc,v 1.4 2009-11-12 07:23:55 tforb Exp $
* $Id: tsoftsffcontainer.cc,v 1.5 2009-11-12 07:38:51 tforb Exp $
* \author Thomas Forbriger
* \date 11/11/2009
*
......@@ -35,7 +35,7 @@
#define DATREAD_TSOFTSFFCONTAINER_CC_VERSION \
"DATREAD_TSOFTSFFCONTAINER_CC V1.0 "
#define DATREAD_TSOFTSFFCONTAINER_CC_CVSID \
"$Id: tsoftsffcontainer.cc,v 1.4 2009-11-12 07:23:55 tforb Exp $"
"$Id: tsoftsffcontainer.cc,v 1.5 2009-11-12 07:38:51 tforb Exp $"
#include <datreadxx/tsoftsffcontainer.h>
#include <datreadxx/tsoftreader.h>
......@@ -58,8 +58,13 @@ namespace datread {
for (int ich=0; ich<infile.nchannels(); ++ich)
{
const Channeldata& cd=dc[ich];
/*
std::cout << "ich " << ich <<
" has " << cd.nsequences() << " sequences" << std::endl;
*/
ntraces += cd.nsequences();
}
// std::cout << "found " << ntraces << " traces" << std::endl;
// reserve space for n traces
outfile.Mtraces=Ttraceseries(ntraces);
......
Supports Markdown
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