Changeset 7338 for trunk/MagicSoft

Timestamp:

08/29/05 16:23:44 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• main/MStarguider.cc (modified) (1 diff)
• tcpip/MDriveCom.cc (modified) (2 diffs)
• tcpip/MDriveCom.h (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2005/08/29 - Daniela Dorner
+
+   * main/MStarguider.cc, tcpip/MDriveCom.[h,cc]:
+     - added to variables to the Starguider report
+
+
 
  2005/08/22 - Thomas Bretz

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -1637 +1637 @@
             if (fCosy) {
                 MDriveCom &com = *fCosy->GetDriveCom();
-                com.SendStargReport(fStatus, fD, fSao->GetZdAz(), sgcenter, spots.GetEntries(), bright, time.GetMjd());    // Report
+                com.SendStargReport(fStatus, fD, fSao->GetZdAz(), sgcenter, spots.GetEntries(), bright, time.GetMjd(), 0, 0);    // Report
             }
 

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -220 +220 @@
 }
 
-bool MDriveCom::SendStargReport(UInt_t stat, ZdAz miss, ZdAz nompos, Ring center, Int_t n, Double_t bright, Double_t mjd)
+bool MDriveCom::SendStargReport(UInt_t stat, ZdAz miss, ZdAz nompos, Ring center, Int_t n, Double_t bright, Double_t mjd, Double_t x, Double_t y)
 {
     // miss   [deg]
@@ -249 +249 @@
     str += txt.Print("%04d ",   n);               //number
     str += txt.Print("%03.1f ",  bright);
-    str += txt.Print("%12.6f", t.GetMjd());      // mjd
-    
+    str += txt.Print("%12.6f ", t.GetMjd());      // mjd
+    str += txt.Print("%.1f ", x);
+    str += txt.Print("%.1f ", y);
+
     return Send("STARG-REPORT", str, kTRUE);
 

trunk/MagicSoft/Cosy/tcpip/MDriveCom.h

@@ -41 +41 @@
 
     bool SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er);
-    bool SendStargReport(UInt_t stat, ZdAz miss, ZdAz nompos, Ring center, Int_t n, Double_t bright, Double_t mjd);
+    bool SendStargReport(UInt_t stat, ZdAz miss, ZdAz nompos, Ring center, Int_t n, Double_t bright, Double_t mjd, Double_t x, Double_t y);
     bool SendStatus(const char *stat);
 };