Changeset 6841 for trunk/MagicSoft/Cosy/main

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• MCosy.cc (modified) (2 diffs)
• MCosy.h (modified) (2 diffs)
• MStarguider.cc (modified) (3 diffs)

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -415 +415 @@
 
 void MCosy::TrackPosition(const RaDec &dst) // ra, dec [rad]
+{
+    MTracking track(this, lout);
+    track.SetOut(fOutRep);
+//#ifdef EXPERT
+//    track.SetPointAccDec(0.4, 0.4);
+//    track.SetPointVelocity(0.2); // fast: 0.6, slow: 0.2
+//#else
+    track.SetPointAccDec(0.2, 0.1);
+    track.SetPointVelocity(0.1);
+//#endif
+    track.SetTrackAccDec(0.1, 0.1);
+
+    track.TrackPosition(dst);
+}
+
+void MCosy::TrackPositionGRB(const RaDec &dst) // ra, dec [rad]
 {
     MTracking track(this, lout);
@@ -701 +717 @@
         return (void*)0x8888;
 
+    case WM_GRB:
+        //cout << "WM_Track: START" << endl;
+        {
+            RaDec dest = ((RaDec*)mp)[0];
+            if (fStarguider)
+                fStarguider->SetPointingPosition(((RaDec*)mp)[1]);
+            if (!CheckNetwork())
+                return (void*)0xebb0;
+            TrackPositionGRB(dest*kDeg2Rad);
+        }
+        //cout << "WM_Track: done. (return 0x8888)" << endl;
+        return (void*)0x8888;
+
     case WM_NEWTRACK:
         //cout << "WM_NewTrack: START" << endl;

trunk/MagicSoft/Cosy/main/MCosy.h

@@ -37 +37 @@
 #define WM_POSITION1    0x100f
 #define WM_ENDSWITCH    0x1010
+#define WM_GRB          0x1011
 
 class ShaftEncoder;
@@ -153 +154 @@
     int  SetPosition(const ZdAz &dst, Bool_t track=kFALSE);
     void TrackPosition(const RaDec &dst); // ra, dec [rad]
+    void TrackPositionGRB(const RaDec &dst); // ra, dec [rad]
 
     void TerminateApp();

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -1219 +1219 @@
     if (outrep.Lock("MStarguider::FindStar"))
     {
-        outrep << "FINDSTAR-REPORT " << MTime(-1) << " " << setprecision(7);
+        outrep << "FINDSTAR-REPORT 00 " << MTime(-1) << " " << setprecision(7);
         outrep << 90-za0.Alt() << " " << za0.Az() << " ";
         outrep << za1.Zd() << " " << za1.Az() << " ";
@@ -1367 +1367 @@
             fStargCaos->Run(img, kFALSE, kFALSE, pos, t, 30, 3.0); // [px]
         const Float_t pixsize = atof(fPixSize->GetText()); // [arcsec/px]
-        sgcenterzdaz.Zd((sgcenter.GetY()-293.6) * pixsize /3600 );
+
+        // BE CAREFULL: This transformation is WRONG. It is just
+        // a transformation of units, but this implies, that the
+        // coordiante axis in both units look the same. This is
+        // wrong exspecially near the zenith were az-lines are highly
+        // curved around the zenith!
+        sgcenterzdaz.Zd((sgcenter.GetY()-293.6) * pixsize /3600 );
         sgcenterzdaz.Az((sgcenter.GetX()-53.2) * pixsize /3600 ); 
 #ifdef EXPERT
@@ -1487 +1493 @@
         f2.DrawCircle(skycenter, 3.84*.5*74.0, 0x0a);
 
+        if (fCosy) {
+            MDriveCom &com = *fCosy->GetDriveCom();
+            com.SendStargReport(fStatus, fD, fSao->GetZdAz(), sgcenter, spots.GetEntries(), bright, time.GetMjd());    // Report
+        }
     } //CalcStars
-
-    if (fCosy) {
-        MDriveCom &com = *fCosy->GetDriveCom();
-        com.SendStargReport(fStatus, fD);    // Report
-    }
 
     // Draw Circles around center of Camera