Added resetconfig routine.

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

diff --git a/o815/o815.h b/o815/o815.h
index 4f741a1e093283e3d1ca5010d58b0cf901bedb29..05053871c1ca302e58625c46639b10e34d8fb4c0 100644 (file)
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -45,6 +45,7 @@ class o815 {
     void nextConfig();
     char *confMem;
     virtual void _newParas()=0;
     void nextConfig();
     char *confMem;
     virtual void _newParas()=0;

+    virtual void _resetConfig()=0;

     int nequi, nskip;
   private:
     virtual void _makeSweep()=0;
     int nequi, nskip;
   private:
     virtual void _makeSweep()=0;


@@ -64,6 +65,7 @@ class o815 {
     string outdir;
     int idonly;
     int showjobnum;
     string outdir;
     int idonly;
     int showjobnum;

+    string startconfig;

   } comargs;
 
   struct comoption {
   } comargs;
 
   struct comoption {


@@ -83,7 +85,7 @@ class o815 {
   vector<obs*> observables;
   sim* Sim;
   void mainLoop();
   vector<obs*> observables;
   sim* Sim;
   void mainLoop();

-  string headMaster();
+  string headMaster( bool hashedrange=false );

   void addPara(const string& paraid, const double& paraDefault);
   void addComOption(const char* name, int has_arg, int *flag, int val, const char* optdesc, const char* argdesc);
   vector< pair<int,char*> > parsedSpecOps;
   void addPara(const string& paraid, const double& paraDefault);
   void addComOption(const char* name, int has_arg, int *flag, int val, const char* optdesc, const char* argdesc);
   vector< pair<int,char*> > parsedSpecOps;


@@ -97,6 +99,8 @@ private:
   string programid;
   int nextParas();
   comoption* getOptionByVal(int val);
   string programid;
   int nextParas();
   comoption* getOptionByVal(int val);

+  static void readCacheArgs(const string& arg, string& cachedir, int& cachemode);
+  unsigned long hash(const string& str);

 };
 
 #endif
 };
 
 #endif