Changeset 9445 for trunk/MagicSoft/Cosy/main

Timestamp:

05/12/09 00:33:30 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/main/MStarguider.cc (modified) (9 diffs)

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -1360 +1360 @@
     Int_t cnt=0;
 
-    MStar *star;
+    MStar *star=0;
     MStarListIter NextStar(&stars);
     while ((star=NextStar()) && cnt<num+5)
@@ -1379 +1379 @@
             x.AddAt(dpos.X(), idx);
             y.AddAt(dpos.Y(), idx);
-            mag.AddAt(log(spot->GetMag())/star->GetMag(), idx);
-
+            mag.AddAt(1, idx);
+//            mag.AddAt(log(spot->GetMag())/star->GetMag(), idx);
+/*
 #ifdef EXPERT
             if (fout)
@@ -1393 +1394 @@
             }
 #endif
+*/
         }
         cnt++;
@@ -1416 +1418 @@
 
     // Check StargTPoint data set request
-    if (!fDisplay->IsEntryChecked(IDM_kStarguiderMode) || !fTPoint->IsDown())
+    if (!fMode->IsEntryChecked(IDM_kStarguiderMode) || !fTPoint->IsDown())
         return numcor;
     fTPoint->SetDown(kFALSE);
@@ -1465 +1467 @@
     *fOutStargTp << " " << setprecision(11) << t.GetMjd();
     *fOutStargTp << " " << setprecision(4) << center.GetMag();
-    *fOutStargTp << " " << star->GetMag();
+    *fOutStargTp << " 0";// << star->GetMag();
     *fOutStargTp << " " << center.GetX() << " " << center.GetY();
     *fOutStargTp << " 0 0";
     *fOutStargTp << " " << numleds << " " << numrings;
     *fOutStargTp << " " << num << " " << numcor << " " << bright;
+    *fOutStargTp << " " << fTPointStarMag << " " << fTPointStarName;
     *fOutStargTp << endl;
 
@@ -1545 +1548 @@
 
     // Check TPoint data set request
-    if (!fDisplay->IsEntryChecked(IDM_kTpointMode) || !fTPoint->IsDown())
+    if (!fMode->IsEntryChecked(IDM_kTpointMode) || !fTPoint->IsDown())
         return;
 
@@ -1600 +1603 @@
     *fOutTp << " " << numleds << " " << numrings;
     *fOutTp << " 0 0 0";
+    *fOutTp << " " << fTPointStarMag << " " << fTPointStarName;
     *fOutTp << endl;
 
@@ -1744 +1748 @@
         fNumStarsDetected = 0;
 
-        cout << " * Switching to TPoint mode" << endl;
-        // Switch to tpoint mode
-        fMode->UnCheckEntry(IDM_kTpointMode);
-        ProcessMessage(MK_MSG(kC_COMMAND, kCM_MENU), IDM_kTpointMode, 0);
-        return kFALSE;
+        if (!fMode->IsEntryChecked(IDM_kTpointMode))
+        {
+            cout << " * Switching to TPoint mode" << endl;
+            // Switch to tpoint mode
+            fMode->UnCheckEntry(IDM_kTpointMode);
+            ProcessMessage(MK_MSG(kC_COMMAND, kCM_MENU), IDM_kTpointMode, 0);
+            return kFALSE;
+        }
+        fTPointFromCC++;
 
     case 2:
@@ -1791 +1799 @@
         fMode->UnCheckEntry(IDM_kTpointMode);
         ProcessMessage(MK_MSG(kC_COMMAND, kCM_MENU), IDM_kTpointMode, 0);
-        break;
+        fTPointFromCC = -1;
+        return kFALSE;
     }
 
     // Send report
-    fTPointFromCC = -1;
 /*
     if (!fCosy)