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

TSOFT reading is now part of ianystream

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: 2893
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent 91ceb12c
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: readany.cc,v 1.15 2007-09-19 10:54:02 tforb Exp $
* $Id: readany.cc,v 1.16 2009-11-12 16:24:39 tforb Exp $
* \author Thomas Forbriger
* \date 06/04/2004
*
......@@ -33,13 +33,14 @@
* - 23/12/2004 V1.2 activate ihpmostream
* - 29/06/2007 V1.3 added SAC binary format
* - 19/09/2007 V1.4 added raw GSE format
* - 12/11/2009 V1.5 added TSOFT format
*
* ============================================================================
*/
#define DATREAD_READANY_CC_VERSION \
"DATREAD_READANY_CC V1.4"
"DATREAD_READANY_CC V1.5"
#define DATREAD_READANY_CC_CVSID \
"$Id: readany.cc,v 1.15 2007-09-19 10:54:02 tforb Exp $"
"$Id: readany.cc,v 1.16 2009-11-12 16:24:39 tforb Exp $"
#include <datreadxx/readany.h>
#include<datreadxx/sff.h>
......@@ -49,6 +50,7 @@
#include<datreadxx/bonjer.h>
#include<datreadxx/sac.h>
#include<datreadxx/gse.h>
#include<datreadxx/tsoft.h>
#include <datreadxx/error.h>
namespace datread {
......@@ -64,6 +66,7 @@ namespace datread {
else if (Mformat==Fmseed) { Mis=new imseedstream(is, debug); }
else if (Mformat==Fsac) { Mis=new isacstream(is); }
else if (Mformat==Fgse) { Mis=new igsestream(is); }
else if (Mformat==Ftsoft) { Mis=new itsoftstream(is); }
else
{ DATREAD_abort("ERROR (ianystream): unknown format!"); }
}
......@@ -95,6 +98,8 @@ namespace datread {
{ retval=Fsac; }
else if (id=="gse")
{ retval=Fgse; }
else if (id=="tsoft")
{ retval=Ftsoft; }
else { DATREAD_abort("unknown data type identifier!"); }
return(retval);
}
......@@ -111,6 +116,7 @@ namespace datread {
case Fbonjer: retval="bonjer"; break;
case Fsac: retval="sac"; break;
case Fgse: retval="gse"; break;
case Ftsoft: retval="tsoft"; break;
default: DATREAD_abort("unknown data type ID#!");
}
return(retval);
......@@ -131,6 +137,7 @@ namespace datread {
<< std::endl;
os << " sac: SAC binary format" << std::endl;
os << " gse: raw GSE format" << std::endl;
os << " tsoft: TSOFT format" << std::endl;
os << DATREAD_READANY_CC_CVSID << std::endl;
}
......@@ -148,6 +155,7 @@ namespace datread {
os << "Bonjer data: "; ibonjerstream::help(os);
os << "SAC data: "; isacstream::help(os);
os << "GSE data: "; igsestream::help(os);
os << "TSOFT data: "; itsoftstream::help(os);
}
} // namespace datread
......
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: readany.h,v 1.17 2007-09-19 10:55:04 tforb Exp $
* $Id: readany.h,v 1.18 2009-11-12 16:24:39 tforb Exp $
* \author Thomas Forbriger
* \date 31/03/2004
*
......@@ -31,6 +31,7 @@
* - 31/03/2004 V1.0 Thomas Forbriger
* - 29/06/2007 V1.1 added SAC binary format
* - 19/09/2007 V1.2 added raw GSE format
* - 12/11/2009 V1.3 added TSOFT data
*
* ============================================================================
*/
......@@ -39,9 +40,9 @@
#ifndef DATREAD_READANY_H_VERSION
#define DATREAD_READANY_H_VERSION \
"DATREAD_READANY_H V1.2"
"DATREAD_READANY_H V1.3"
#define DATREAD_READANY_H_CVSID \
"$Id: readany.h,v 1.17 2007-09-19 10:55:04 tforb Exp $"
"$Id: readany.h,v 1.18 2009-11-12 16:24:39 tforb Exp $"
#include<datreadxx/datread.h>
......@@ -54,7 +55,8 @@ namespace datread {
Fmseed, //<! MiniSEED data
Fbonjer,//<! Format specified by K. Bonjer
Fsac, //<! SAC binary data
Fgse //<! raw GSE data
Fgse, //<! raw GSE data
Ftsoft //<! TSOFT data
}; // enum Eformat
#define ANYDELEGATE( function ) function() const { return(Mis->function()); }
......
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