Changeset 9550 for trunk/MagicSoft/Cosy/tcpip

Timestamp:

02/23/10 10:17:52 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

• MDriveCom.cc (modified) (4 diffs)
• MDriveCom.h (modified) (1 diff)

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -135 +135 @@
     }
 
-    Int_t id, len; // Starguider switched on or not
-    Float_t dra, ddec;
-    Int_t n=sscanf(str.Data(), "%d %f %f %n", &id, &dra, &ddec, &len);
+    Int_t id, len;
+    Float_t offset, angle;
+    Int_t n=sscanf(str.Data(), "%d %f %f %n", &id, &offset, &angle, &len);
     if (n!=3)
     {
@@ -153 +153 @@
     }
 
-    gLog << all << "CC-COMMAND " << MTime(-1) << " CELEST ID=" << id << " dRa=" << dra << "deg dDec=" << ddec << "deg" << endl;
+    gLog << all << "CC-COMMAND " << MTime(-1) << " CELEST ID=" << id << " WobbleOffset=" << offset << "deg WobbleAngle=" << angle << "deg" << endl;
 
     if (id==0)
@@ -167 +167 @@
     }
 
-    // Moon;
-    id = 3;
-
-    gLog << warn << "WARNING - Tracking the moon's center forced." << endl;
-
-    //cout << "MDriveCom - POSITION... start." << endl;
-    if (fQueue)
-        fQueue->PostMsg(WM_PLANET, &id, sizeof(id));
-    //cout << "MDriveCom - POSITION... done." << endl;
+    Double_t data[3] = { id, offset, angle };
+
+    //cout << "MDriveCom - CELEST... start." << endl;
+    if (fQueue)
+        fQueue->PostMsg(WM_CELEST, data, sizeof(Double_t)*3);
+    //cout << "MDriveCom - CELEST... done." << endl;
+    return true;
+}
+
+bool MDriveCom::CommandMOON(TString &str)
+{
+    str = str.Strip(TString::kBoth);
+    if (str.IsNull())
+    {
+        gLog << err << "ERROR - MOON command empty." << endl;
+        return false;
+    }
+
+    Int_t len;
+    Float_t wobble, offset;
+    Int_t n=sscanf(str.Data(), "%f %f %n", &wobble, &offset, &len);
+    if (n!=2)
+    {
+        gLog << warn << "WARNING - Not enough argmuents (MOON)." << endl;
+        return kCONTINUE;
+    }
+
+    str.Remove(0, len);
+    str = str.Strip(TString::kBoth);
+
+    if (!str.IsNull())
+    {
+        gLog << err << "ERROR - Too many bytes in command MOON" << endl;
+        return false;
+    }
+
+    gLog << all << "CC-COMMAND " << MTime(-1) << " MOON WobbleOffset=" << wobble << "deg ShadowOffset=" << offset << "deg" << endl;
+
+    Double_t data[2] = { wobble, offset };
+
+    //cout << "MDriveCom - MOON... start." << endl;
+    if (fQueue)
+        fQueue->PostMsg(WM_MOON, data, sizeof(Double_t)*2);
+    //cout << "MDriveCom - MOON... done." << endl;
     return true;
 }
@@ -300 +335 @@
     if (cmd==(TString)"CELEST")
         return CommandCELEST(str);
+
+    if (cmd==(TString)"MOON")
+        return CommandMOON(str);
 
     if (cmd==(TString)"PREPS")

trunk/MagicSoft/Cosy/tcpip/MDriveCom.h

@@ -31 +31 @@
     bool CommandZDAZ(TString &str);
     bool CommandCELEST(TString &str);
+    bool CommandMOON(TString &str);
     bool CommandPREPS(TString &str);
     bool CommandARM(TString &str);