Commit 739b3d40 authored by thomas.forbriger's avatar thomas.forbriger

ts/hd/cooset [FEATURE]: let cooset support all libdatrwxx formats

parent 8bb19743
......@@ -96,10 +96,6 @@ offli sesot merse: %: %.o
$(FC) -o $@ $< -ltf -lsffu -ltime_trad -lsff \
$(LDFLAGS) -L$(LOCLIBDIR)
cooset: %: %.o
$(CXX) -o $@ $^ -I$(LOCINCLUDEDIR) -lsffxx -ltime++ -lgsexx -laff \
-ltfxx $(LDFLAGS) $(CXXFLAGS) $(FLAGS) -L$(LOCLIBDIR)
chacox: %x: %.o
$(FC) -o $@ $< -ltf \
-lfapidxx -ldatrwxx -lsffxx -lgsexx -ltime++ -laff \
......@@ -110,7 +106,7 @@ offlix: %x: %.o
-lfapidxx -ldatrwxx -lsffxx -lgsexx -ltime++ -laff \
$(LDFLAGS) -L$(LOCLIBDIR)
sehefixx tijerasxx: %: %.o
cooset sehefixx tijerasxx: %: %.o
$(CXX) -o $@ $^ -I$(LOCINCLUDEDIR) -ldatrwxx \
-lsffxx -ltime++ -lgsexx -laff -ltfxx \
$(LDFLAGS) $(CXXFLAGS) $(FLAGS) $(LDFLAGS) -L$(LOCLIBDIR)
......
......@@ -84,6 +84,7 @@ std::ostream& operator<<(std::ostream& os, const sff::FREE& free)
os << " " << *I << std::endl;;
++I;
}
return(os);
} // std::ostream& operator<<(std::ostream& os, const sff::FREE& free)
/* ====================================================================== */
......@@ -285,7 +286,7 @@ int main(int iargc, char* argv[])
} // if (is.hasfree())
// leave a note
fileheader.appendfree(COOSET_VERSION);
filefree.append(COOSET_VERSION);
// read and modify SRCE line
sff::SRCE srceline;
......@@ -293,16 +294,16 @@ int main(int iargc, char* argv[])
{
is >> srceline;
// modify file header
filefree.appendfree("input file has SRCE line");
filefree.append("input file has SRCE line");
if (opt.sesot)
{
filefree.appendfree("set source time");
filefree.append("set source time");
libtime::TAbsoluteTime newsot(opt.sourcetime);
srceline.date=newsot;
}
if (opt.sesoc)
{
filefree.appendfree("set source coordinates");
filefree.append("set source coordinates");
std::istringstream socospec(opt.sourcecoo);
char syst;
double x,y,z;
......@@ -314,7 +315,7 @@ int main(int iargc, char* argv[])
srceline.cx=x;
srceline.cy=y;
srceline.cz=z;
filefree.appendfree(message.str());
filefree.append(message.str());
}
} // if (is.hassrce())
......@@ -345,7 +346,7 @@ int main(int iargc, char* argv[])
if (opt.verbose)
{
cout << endl << "output file FREE block:" << endl;
cout << filefree.free();
cout << filefree;
}
/*----------------------------------------------------------------------*/
......@@ -453,7 +454,7 @@ int main(int iargc, char* argv[])
infoline.cx=thestation.x;
infoline.cy=thestation.y;
infoline.cz=thestation.z;
freeblock.appendfree(message.str());
freeblock.append(message.str());
i=station.size();
}
}
......@@ -461,13 +462,13 @@ int main(int iargc, char* argv[])
{
if (opt.verbose)
{
cout << freeblock.free() << endl;
cout << freeblock << endl;
}
}
else
{
cerr << "could not find station " << wid2.station << endl;
freeblock.appendfree("could not find station!");
freeblock.append("could not find station!");
}
} // if (opt.dostations)
os << infoline;
......
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