X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/4d1416455c49f0ba19954ca80a72b72f9dfcd33e..81106ca76faf22180d0cd4bc1402847378e4ff68:/o815/o815.h?ds=inline

diff --git a/o815/o815.h b/o815/o815.h
index 2f12fc5..242d1e8 100644
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -8,6 +8,7 @@
 
 #include "latlib/paraq.h"
 #include "latlib/writeout.h"
+#include "latlib/hypercache.h"
 
 using namespace std;
 
@@ -20,9 +21,11 @@ class o815 {
   public:
     obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize);
     void finish();
-    void meas();
+    void meas(bool loadedobs);
     void start();
     string getDataDesc() { return datadesc; };
+    int ocid;
+    string obsid;
   private:
     virtual void _meas(bool loadedobs)=0;
     virtual void _finish()=0;
@@ -30,9 +33,10 @@ class o815 {
   protected:
     o815 *O815;
     char *obsMem;
-    string obsid, simid, datadesc;
+    string simid, datadesc;
     ostream *out, *log;
-    int ocid;
+    void printParas();
+    paraq* paraQ;
   };
 
   class sim {
@@ -70,6 +74,7 @@ class o815 {
   sim* Sim;
   void mainLoop();
   string headMaster();
+  void addPara(const string& paraid, const double& paraDefault);
 
 private:
   MPI_Status mpiStatus;