X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/1a5483766d4056eec087099f2e411aef51b63cf5..7d17aa8c6bde2e49502401aa190a900bd4688362:/o815/o815.h diff --git a/o815/o815.h b/o815/o815.h index 33693b0..467eca9 100644 --- a/o815/o815.h +++ b/o815/o815.h @@ -21,9 +21,10 @@ 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; private: virtual void _meas(bool loadedobs)=0; virtual void _finish()=0; @@ -33,7 +34,6 @@ class o815 { char *obsMem; string obsid, simid, datadesc; ostream *out, *log; - int ocid; }; class sim { @@ -71,6 +71,7 @@ class o815 { sim* Sim; void mainLoop(); string headMaster(); + void addPara(const string& paraid, const double& paraDefault); private: MPI_Status mpiStatus;