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

Timestamp:

02/21/08 22:03:06 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Cosy/cosy.cc

@@ -14 +14 @@
 #include "MCosy.h"
 #include "MTime.h"
+#include "MDriveCom.h"
 
 #include "MLogManip.h"
@@ -92 +93 @@
     const TString sps           = arg.GetStringAndRemove("--sps=", "sps");
     const TString ceco          = arg.GetStringAndRemove("--cc=", "ceco"); // ceco
+    const Int_t   ceco_tx       = arg.GetIntAndRemove("--cc-tx=", 7314);//7304);
+    const Int_t   ceco_rx       = arg.GetIntAndRemove("--cc-rx=", 7414);//7404);
     const TString pointing      = arg.GetStringAndRemove("--pointing-model=", "bending2.txt"); // ceco
     const TString kConfig       = arg.GetStringAndRemove("--config=", ".cosyrc"); // ceco
@@ -191 +194 @@
             break;
         }
-*/
-    MCosy *cosy = new MCosy(env, ceco, pointing);
+        */
+
+    MDriveCom com(ceco, ceco_tx, ceco_rx);
+
+    MCosy *cosy = new MCosy(env, &com, pointing);
+
+    com.SetMsgQueue(cosy);
 
     Interface *interface = new Ethernet(sps, 5357, 5358, cosy);
@@ -211 +219 @@
         gLog << all << "- Starting Camera." << endl;
         client=new MStarguider(MObservatory::kMagic1, channel);
+        //client.SetDriveCom(&com);
         cosy->SetStarguider(client);
         client->SetCosy(cosy);
@@ -239 +248 @@
     gLog << all << "Deleting cosy at " << MTime(-1) << endl;
 
+    //com.SetMsgQueue(NULL);
+
     delete cosy;