...

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

diff --git a/o815/o815.h b/o815/o815.h
index 31d36da421dc0aa8b8a3640a2cc84dab85426d84..242d1e88a1a5631094f151529604f24bb48ba652 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;
 


@@ -15,20 +16,42 @@ class obs;
 
 class o815 {
  public:
 
 class o815 {
  public:

+

   class obs {
   public:
   class obs {
   public:

-    obs(const string& obsid, o815 *_O815);
+    obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize);

     void finish();
     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;
   private:
     virtual void _meas(bool loadedobs)=0;
     virtual void _finish()=0;

+    virtual void _start()=0;

   protected:
     o815 *O815;
     char *obsMem;
   protected:
     o815 *O815;
     char *obsMem;

-    ostream *oout;
-    ostream *olog;
-    string obsid;
+    string simid, datadesc;
+    ostream *out, *log;
+    void printParas();
+    paraq* paraQ;
+  };
+
+  class sim {
+  public:
+    sim(o815 *_O815, const int& _confmemSize);
+    void nextConfig();
+    bool toEquilibrate;
+    char *confMem;
+  private:
+    virtual void _reset()=0;
+    virtual void _makeSweep(int nsweep)=0;
+  protected:
+    o815 *O815;
+    ostream *log;
+    int nequi, nskip;

   };
 
   struct {
   };
 
   struct {


@@ -44,9 +67,14 @@ class o815 {
   } comargs;
 
   o815(int argc, char **argv, const string& programid);
   } comargs;
 
   o815(int argc, char **argv, const string& programid);

+  ~o815();

   paraq *paraQ;
   writeout *out;
   vector<obs*> observables;
   paraq *paraQ;
   writeout *out;
   vector<obs*> observables;

+  sim* Sim;
+  void mainLoop();
+  string headMaster();
+  void addPara(const string& paraid, const double& paraDefault);

 
 private:
   MPI_Status mpiStatus;
 
 private:
   MPI_Status mpiStatus;


@@ -54,7 +82,7 @@ private:
   static void listArg(int *target, int tlen, char *listarg);
   void parseArgs(int argc, char **argv);
   string programid;
   static void listArg(int *target, int tlen, char *listarg);
   void parseArgs(int argc, char **argv);
   string programid;

-  string headMaster();
+  int nextParas();

 };
 
 #endif
 };
 
 #endif