X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/94af0f788c0a84b3494723adfa3e5ce55edc1b43..d09f5f0aeff338a0262c3faf5272b82945a3bf8f:/o815/o815.h?ds=inline diff --git a/o815/o815.h b/o815/o815.h index 9f980f7..b3ad62a 100644 --- a/o815/o815.h +++ b/o815/o815.h @@ -20,15 +20,16 @@ class o815 { class obs { public: - obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize); + obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize, const string& _obsidpostfix=""); void finish(); - void meas(bool loadedobs); + void meas(bool loadedobs, const int& nthmeas); void start(); string getDataDesc() { return datadesc; }; int ocid; string obsid; + string obsidpostfix; private: - virtual void _meas(bool loadedobs)=0; + virtual void _meas(bool loadedobs, const int& nthmeas)=0; virtual void _finish()=0; virtual void _start()=0; protected: @@ -45,12 +46,13 @@ class o815 { void nextConfig(); char *confMem; virtual void _newParas()=0; + int nequi, nskip; private: virtual void _makeSweep()=0; protected: o815 *O815; ostream *log; - int nequi, nskip, confmemSize; + int confmemSize; }; struct {