Moved boost headers in configcache to source file.

[phys/latlib.git] / o815 / obs.cpp

diff --git a/o815/obs.cpp b/o815/obs.cpp
index ee785a73a75a3597d8a2b40b29149e39e7a5279e..ae973401eec82cde4eb9cef70fd0445cd0e2729f 100644 (file)
--- a/o815/obs.cpp
+++ b/o815/obs.cpp
@@ -8,8 +8,8 @@ void o815::obs::finish() {
 
 void o815::obs::start() {
   if(O815->rank==0) {
 
 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=="")
   }
 
   if (O815->comargs.outdir=="")


@@ -18,18 +18,20 @@ void o815::obs::start() {
   _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;
   obsid = _obsid;

+  obsidpostfix = _obsidpostfix;

   O815 = _O815;
   datadesc = _datadesc;
   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;
   log = O815->out->log;

+  paraQ = O815->paraQ;

 
   ocid = hypercache::initO(O815->programid + "-" + obsid, O815->comargs.nequi, O815->comargs.nskip,
                           O815->comargs.obscache.first, &obsMem, obsmemSize, O815->comargs.obscache.second, log);
 
   ocid = hypercache::initO(O815->programid + "-" + obsid, O815->comargs.nequi, O815->comargs.nskip,
                           O815->comargs.obscache.first, &obsMem, obsmemSize, O815->comargs.obscache.second, log);