Changeset 8833 for trunk/MagicSoft/Cosy/main/MCosy.h

Timestamp:

01/24/08 14:05:28 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/main/MCosy.h (modified) (6 diffs)

trunk/MagicSoft/Cosy/main/MCosy.h

@@ -2 +2 @@
 #define COSY_MCosy
 
-#include "coord.h"
+//#include "coord.h"
 #include "msgqueue.h"
+#include "MPointing.h"
+
+#ifndef MARS_MThread
+#define COSY_MThread
 #include "MThread.h"
-#include "MBending.h"
+#endif
 
 #ifndef COSY_Network
@@ -49 +53 @@
 class MDriveCom;
 
-class MTTalk : public MThread
+class MTTalk : public MyThreadX
 {
 private:
     MCosy *fCosy;
 
-    void *Thread();
+    Int_t Thread();
 
 public:
-    MTTalk(MCosy *cosy) : MThread(false), fCosy(cosy)
-    {
-        SetPriority(10);
-        Detach();
-        Start();
+    MTTalk(MCosy *cosy) : MyThreadX("MTTalk"), fCosy(cosy)
+    {
+        //SetPriority(10);
+        //Detach();
+        RunThread();
     }
-    ~MTTalk() { std::cout << "~MTTalk::MTTalk" << std::endl; }
+    ~MTTalk()
+    {
+        std::cout << "~MTTalk::CancelThread" << std::endl;
+        CancelThread();
+        std::cout << "~MTTalk::MTTalk" << std::endl;
+    }
 };
 
@@ -70 +79 @@
 {
     friend class MTTalk;
-    friend class MPointing;
+    friend class MSlewing;
     friend class MTracking;
 
@@ -125 +134 @@
     XY kGearTot; // describing the resolution of the system [re/U_tel]
 
-    MBending fBending;
+    MPointing fBending;
 
     UInt_t fStatus;
@@ -176 +185 @@
 
 public:
-    MCosy(/*int mode,*/ const char *dev, const int baud, MLog &out=gLog);
+    MCosy();
     ~MCosy();
 
@@ -182 +191 @@
     void Stop();
 
-    void *Proc(int msg, void *mp);
+    Int_t Proc(int msg, void *mp);
 
     Bool_t HandleTimer(TTimer *t);