X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/2941710185479c3748e991a3932c4af8832204a9..681f1e885b0f95d7278ad2e7e0f2d157c0048390:/o815/obs.cpp?ds=inline

diff --git a/o815/obs.cpp b/o815/obs.cpp
index c927935..807d4ee 100644
--- a/o815/obs.cpp
+++ b/o815/obs.cpp
@@ -1,13 +1,15 @@
 #include "o815.h"
 
+#include "latlib/hypercache.h"
+
 void o815::obs::finish() {
   _finish();
 }
 
 void o815::obs::start() {
   if(O815->rank==0) {
-    *oout << "#" << obsid << O815->headMaster() << endl << flush;
-    *oout << "#" << obsid << O815->headMaster() << "-" << datadesc << endl << flush;
+    *out << "#" << O815->programid << "-" << obsid << O815->headMaster() << endl << flush;
+    *out << "#" << O815->programid << "-" << obsid << O815->headMaster() << "-" << datadesc << endl << flush;
   }
 
   if (O815->comargs.outdir=="")
@@ -16,16 +18,20 @@ void o815::obs::start() {
   _start();
 }
 
-void o815::obs::meas() {
-  _meas(true);
+void o815::obs::meas(bool loadedobs) {
+  _meas(loadedobs);
 }
 
-o815::obs::obs(const string& _obsid, const string& _datadesc, o815 *_O815, char *_obsmem, const int& _obsmemSize) {
+o815::obs::obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& obsmemSize) {
   obsid = _obsid;
   O815 = _O815;
   datadesc = _datadesc;
-  
   O815->out->newsub(obsid);
-  oout = O815->out->out[obsid];
-  olog = O815->out->log;
+
+  out = O815->out->out[obsid];
+  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);
 }