Changeset 8862 for trunk/MagicSoft/Cosy/cosy.cc

Timestamp:

02/13/08 19:44:39 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/cosy.cc (modified) (6 diffs)

trunk/MagicSoft/Cosy/cosy.cc

@@ -10 +10 @@
 #include "vmodican.h"
 
+#include "MEnv.h"
 #include "MArgs.h"
 #include "MCosy.h"
@@ -50 +51 @@
     gLog << " Options:" << endl;
     gLog.Usage();
+    gLog << "   --debug-env=0             Disable debugging setting resources <default>" << endl;
+    gLog << "   --debug-env[=1]           Display untouched resources after program execution" << endl;
+    gLog << "   --debug-env=2             Display untouched resources after eventloop setup" << endl;
+    gLog << "   --debug-env=3             Debug setting resources from resource file and command line" << endl;
+    gLog << "   --debug-mem               Debug memory usage" << endl << endl;
     gLog << "   --debug-threads           Debug threads" << endl << endl;
+    gLog << "   --rc=Name:option          Set or overwrite a resource of the resource file." << endl << endl;
     gLog << "   --version, -V             Show startup message with version number" << endl;
     gLog << "   -?, -h, --help            This help" << endl << endl;
@@ -80 +87 @@
     }
 
-    const Int_t  channel       = arg.GetIntAndRemove("--channel=", 0);
-    const Bool_t kDebugMem     = arg.HasOnlyAndRemove("--debug-mem");
-    const Bool_t kDebugThreads = arg.HasOnlyAndRemove("--debug-threads");
+    const Int_t   channel       = arg.GetIntAndRemove("--channel=", 0);
+    const Bool_t  kDebugMem     = arg.HasOnlyAndRemove("--debug-mem");
+    const Bool_t  kDebugThreads = arg.HasOnlyAndRemove("--debug-threads");
+    const TString sps           = arg.GetStringAndRemove("--sps=", "127.0.0.1");
+    const TString ceco          = arg.GetStringAndRemove("--cc=", "ceco"); // ceco
+    const TString pointing      = arg.GetStringAndRemove("--pointing-model=", "bending2.txt"); // ceco
+    const TString kConfig       = arg.GetStringAndRemove("--config=", ".cosyrc"); // ceco
+    Int_t  kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0;
+    kDebugEnv = arg.GetIntAndRemove("--debug-env=", kDebugEnv);
 
     //
@@ -93 +106 @@
         return 2;
     }
-/*
+
     //
     // Now we access/read the resource file. This will remove all
@@ -108 +121 @@
     if (!env.TakeEnv(arg, kDebugEnv>2))
         return 0xfd;
-*/
+
     //
     // check for the right usage of the program (number of options)
@@ -178 +191 @@
         }
 */
-    MCosy *cosy = new MCosy();
-
-    Interface *interface = new Ethernet("127.0.0.1", 5357, 5358, cosy);
+    MCosy *cosy = new MCosy(env, ceco, pointing);
+
+    Interface *interface = new Ethernet(sps, 5357, 5358, cosy);
     // Interface *interface = new VmodIcan(cosy, "/dev/dpm_00", 125);
 
     gLog << all << "- Starting MCosy." << endl;
 
-    cosy->Start();
+    cosy->Start(env);
+
+    // FIXME: Is this the right position?
+    if (kDebugEnv>0)
+        env.PrintUntouched();
+
 
     MStarguider *client=0;