Changeset 8839 for trunk/MagicSoft

Timestamp:

01/30/08 14:08:26 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• main/MCosy.cc (modified) (3 diffs)
• main/MCosy.h (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -18 +18 @@
    * main/MStarguider.cc:
      - revised includes
+
+   * main/MCosy.[h,cc]:
+     - chnaged some manipulators
+     - adapted calls to consructors of Macs and ShaftEncoders
 
 

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -13 +13 @@
 #include <TCanvas.h>
 
+//#include "MLog.h"
 #include "MLogManip.h"
 
+#include "MTime.h"
+#include "MPointing.h"
+
 #include "MGCosy.h"
-#include "MTime.h"
 #include "MDriveCom.h"
 #include "MStarguider.h"
 #include "SlaStars.h"
-#include "MPointing.h"
 #include "MTracking.h"
 
@@ -111 +113 @@
 }
 */
+
+MTTalk::~MTTalk()
+{
+    gLog << inf2 << "~MTTalk::CancelThread" << std::endl;
+    CancelThread();
+    gLog << inf2 << "~MTTalk::MTTalk" << std::endl;
+}
 
 // --------------------------------------------------------------------------
@@ -1479 +1488 @@
     gLog << "- Setting up network." << endl;
 
-    fMac1=new Macs(id1, "Mac/Az", gLog);
-    fMac2=new Macs(id3, "Mac/Zd", gLog);
+    fMac1=new Macs(id1, "Mac/Az");
+    fMac2=new Macs(id3, "Mac/Zd");
     if (id2>=0)
-        fMac3=new Macs(id2, "Mac/Az-Sync", gLog);
-
-    fZd1=new ShaftEncoder(id4, "SE/Zd1", gLog);
-    fZd2=new ShaftEncoder(id5, "SE/Zd2", gLog);
-    fAz =new ShaftEncoder(id6, "SE/Az",  gLog);
+        fMac3=new Macs(id2, "Mac/Az-Sync");
+
+    fZd1=new ShaftEncoder(id4, "SE/Zd1");
+    fZd2=new ShaftEncoder(id5, "SE/Zd2");
+    fAz =new ShaftEncoder(id6, "SE/Az");
 
     fZd1->SetReport(fOutRep);

trunk/MagicSoft/Cosy/main/MCosy.h

@@ -67 +67 @@
         RunThread();
     }
-    ~MTTalk()
-    {
-        std::cout << "~MTTalk::CancelThread" << std::endl;
-        CancelThread();
-        std::cout << "~MTTalk::MTTalk" << std::endl;
-    }
+    ~MTTalk();
 };