X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/a5f05e337d18c193ac57b4da0013d1cdc69f8faa..d09f5f0aeff338a0262c3faf5272b82945a3bf8f:/o815/obs.cpp?ds=sidebyside diff --git a/o815/obs.cpp b/o815/obs.cpp index 807d4ee..ae97340 100644 --- a/o815/obs.cpp +++ b/o815/obs.cpp @@ -8,8 +8,8 @@ void o815::obs::finish() { void o815::obs::start() { if(O815->rank==0) { - *out << "#" << O815->programid << "-" << obsid << O815->headMaster() << endl << flush; - *out << "#" << O815->programid << "-" << obsid << O815->headMaster() << "-" << datadesc << endl << flush; + *out << "#" << O815->programid << "-" << obsid << obsidpostfix << O815->headMaster() << endl << flush; + *out << "#" << O815->programid << "-" << obsid << obsidpostfix << O815->headMaster() << "-" << datadesc << endl << flush; } if (O815->comargs.outdir=="") @@ -18,17 +18,18 @@ void o815::obs::start() { _start(); } -void o815::obs::meas(bool loadedobs) { - _meas(loadedobs); +void o815::obs::meas(bool loadedobs, const int& nthmeas) { + _meas(loadedobs, nthmeas); } -o815::obs::obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& obsmemSize) { +o815::obs::obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& obsmemSize, const string& _obsidpostfix) { obsid = _obsid; + obsidpostfix = _obsidpostfix; O815 = _O815; datadesc = _datadesc; - O815->out->newsub(obsid); + O815->out->newsub(obsid+obsidpostfix); - out = O815->out->out[obsid]; + out = O815->out->out[obsid+obsidpostfix]; log = O815->out->log; paraQ = O815->paraQ;