Changeset 6841 for trunk/MagicSoft/Cosy/tcpip

Timestamp:

03/17/05 11:02:59 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

• MCeCoCom.cc (modified) (4 diffs)
• MDriveCom.cc (modified) (5 diffs)
• MDriveCom.h (modified) (3 diffs)

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc

@@ -32 +32 @@
     // Remove the 30 tokens of the subsystem status
     //  table 12.1 p59
-    for (int i=0; i<30; i++)
+    for (int i=0; i<31; i++)
         str.Remove(0, str.First(' ')+1);
 
@@ -38 +38 @@
     float zd, az, dec, ra, temp, solar, wind, hum;
     n=sscanf(str.Data(),
-             "%f %f %f %f %f %f %f %f %*f %*f %n",
+             "%f %f %f %f %f %f %f %f %*f %*f %*s %*s %*s %*s %n",
              &zd, &az, &dec, &ra, &temp, &solar, &wind, &hum, &len);
     if (n!=8)
@@ -60 +60 @@
     fWindSpeed = wind;
 
-    if (fWindSpeed>30)
+    if (fWindSpeed>50)
         fAlarmCounter++;
     else
@@ -136 +136 @@
     if (fHumidity>80)
         rc++;
-    if (fWindSpeed>10)
+    if (fWindSpeed>30)
         rc++;
-    if (fWindSpeed>20)
+    if (fWindSpeed>40)
         rc++;
-    if (fWindSpeed>30)
+    if (fWindSpeed>50)
         rc++;
 

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -7 +7 @@
 #include "MCosy.h"
 #include "MString.h"
+#include "Ring.h"
 
 using namespace std;
@@ -62 +63 @@
     //cout << "MDriveCom - TRACK... start." << endl;
     fQueue->PostMsg(WM_TRACK, &rd, sizeof(rd));
+    //cout << "MDriveCom - TRACK... done." << endl;
+    return true;
+}
+
+bool MDriveCom::CommandGRB(TString &str)
+{
+    Double_t ra, dec;
+    if (!ReadPosition(str, ra, dec))
+    {
+        cout << "ERROR - Reading position from GRB" << endl;
+        return false;
+    }
+    if (!str.IsNull())
+    {
+        cout << "ERROR - Too many bytes in command GRB" << endl;
+        return false;
+    }
+
+    cout << "CC-COMMAND " << MTime(-1) << " GRB " << ra << "h " << dec << "d '" << str << "'" << endl;
+
+    ra *= 15; // h -> deg
+
+    RaDec rd[2] = { RaDec(ra, dec), RaDec(ra, dec) };
+
+    //cout << "MDriveCom - TRACK... start." << endl;
+    fQueue->PostMsg(WM_GRB, &rd, sizeof(rd));
     //cout << "MDriveCom - TRACK... done." << endl;
     return true;
@@ -113 +140 @@
     if (cmd==(TString)"RADEC")
         return CommandRADEC(str);
+
+    if (cmd==(TString)"GRB")
+        return CommandGRB(str);
 
     if (cmd==(TString)"ZDAZ")
@@ -190 +220 @@
 }
 
-bool MDriveCom::SendStargReport(UInt_t stat, ZdAz miss)
-{
-   
-    // miss [rad]
+bool MDriveCom::SendStargReport(UInt_t stat, ZdAz miss, ZdAz nompos, Ring center, Int_t n, Double_t bright, Double_t mjd)
+{
+    // miss   [deg]
+    // nompos [rad]
     const MTime t(-1);
 
-    miss *= kRad2Deg;
+    miss   *= 60;        // [arcmin]
+    nompos *= kRad2Deg;  // [deg]
 
     // Set status flag
@@ -211 +242 @@
 
     TString str;
-    str += txt.Print("%05.3f ", miss.Zd());
-    str += txt.Print("%05.3f", miss.Az());
+    str += txt.Print("%05.3f ", miss.Zd());       //[arcmin]
+    str += txt.Print("%05.3f ", miss.Az());       //[arcmin]
+    Print(str, nompos.Zd());                      //[deg]
+    Print(str, nompos.Az());                      //[deg]
+    str += txt.Print("%05.1f ",   center.GetX()); //number
+    str += txt.Print("%05.1f ",   center.GetY()); //number
+    str += txt.Print("%04d ",   n);               //number
+    str += txt.Print("%03.1f",  bright);
+    str += txt.Print("%12.6f ", t.GetMjd());      // mjd
     
     return Send("STARG-REPORT", str, kTRUE);

trunk/MagicSoft/Cosy/tcpip/MDriveCom.h

@@ -9 +9 @@
 class ZdAz;
 class MsgQueue;
+class Ring;
 
 class MDriveCom : public MCeCoCom
@@ -22 +23 @@
 
     bool CommandRADEC(TString &str);
+    bool CommandGRB(TString &str);
     bool CommandZDAZ(TString &str);
 
@@ -39 +41 @@
 
     bool SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er);
-    bool SendStargReport(UInt_t stat, ZdAz miss);
+    bool SendStargReport(UInt_t stat, ZdAz miss, ZdAz nompos, Ring center, Int_t n, Double_t bright, Double_t mjd);
     bool SendStatus(const char *stat);
 };