...

[phys/latlib.git] / o815 / o815.h

diff --git a/o815/o815.h b/o815/o815.h
index 2f12fc5162b209fe263d4e2f355e31acc24bacc9..467eca9030d8ffe7ea0940e01cb8ea65137d0cb4 100644 (file)
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -8,6 +8,7 @@
 
 #include "latlib/paraq.h"
 #include "latlib/writeout.h"
 
 #include "latlib/paraq.h"
 #include "latlib/writeout.h"

+#include "latlib/hypercache.h"

 
 using namespace std;
 
 
 using namespace std;
 


@@ -20,9 +21,10 @@ class o815 {
   public:
     obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize);
     void finish();
   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; };
     void start();
     string getDataDesc() { return datadesc; };

+    int ocid;

   private:
     virtual void _meas(bool loadedobs)=0;
     virtual void _finish()=0;
   private:
     virtual void _meas(bool loadedobs)=0;
     virtual void _finish()=0;


@@ -32,7 +34,6 @@ class o815 {
     char *obsMem;
     string obsid, simid, datadesc;
     ostream *out, *log;
     char *obsMem;
     string obsid, simid, datadesc;
     ostream *out, *log;

-    int ocid;

   };
 
   class sim {
   };
 
   class sim {


@@ -70,6 +71,7 @@ class o815 {
   sim* Sim;
   void mainLoop();
   string headMaster();
   sim* Sim;
   void mainLoop();
   string headMaster();

+  void addPara(const string& paraid, const double& paraDefault);

 
 private:
   MPI_Status mpiStatus;
 
 private:
   MPI_Status mpiStatus;