...

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

diff --git a/o815/o815.h b/o815/o815.h
index 33693b002aaceba341c488662d1666e10990788b..242d1e88a1a5631094f151529604f24bb48ba652 100644 (file)
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -21,9 +21,11 @@ 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;
+    string obsid;

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


@@ -31,9 +33,10 @@ class o815 {
   protected:
     o815 *O815;
     char *obsMem;
   protected:
     o815 *O815;
     char *obsMem;

-    string obsid, simid, datadesc;
+    string simid, datadesc;

     ostream *out, *log;
     ostream *out, *log;

-    int ocid;
+    void printParas();
+    paraq* paraQ;

   };
 
   class sim {
   };
 
   class sim {


@@ -71,6 +74,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;