Changeset 7794 for trunk/MagicSoft/Cosy/main

Timestamp:

07/16/06 01:38:53 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -130 +130 @@
 
     fGStarg->Update(fPos, fD);   
-    fGNumStars->Update(fNumStarsDetected, fNumStarsCorrelated);
+    if (fDisplay->IsEntryChecked(IDM_kStarguider))
+        fGNumStars->Update(fNumStarsDetected, fNumStarsCorrelated);
  
     return kTRUE;
@@ -445 +446 @@
 
     // Set input box for rotation angle
-    const Double_t angle = -0.4;
+    const Double_t angle = -0.2;
     fSao->SetRotationAngle(angle);
     
@@ -458 +459 @@
 
     // Set input box for pixel size
-    const Double_t pixsize = 48.8; // used to be 23.4
+    const Double_t pixsize = 48.9; // used to be 23.4
 
     fSao->SetPixSize(pixsize);
-    fSao->SetRotationAngle(0);
 
     txt = "";
@@ -519 +519 @@
     fCRaDec->UnmapWindow();
     fCZdAz->UnmapWindow();
+    fCZdAzText->UnmapWindow();
     fPZdAz->UnmapWindow();
     fPZdAzText->UnmapWindow();
@@ -723 +724 @@
         fDisplay->CheckEntry(IDM_kCatalog);
         fCRaDec->MapWindow();
-        fCRaDecText-MapWindow();
         fCZdAz->MapWindow();
         fCZdAzText->MapWindow();
@@ -771 +771 @@
         //catalog
         fCRaDec->UnmapWindow();
-        fCRaDecText-UnmapWindow();
         fCZdAz->UnmapWindow();
         fCZdAzText->UnmapWindow();
@@ -1408 +1407 @@
 {
     num = leds.GetEntries();
+    //cout << "Num: " << num << endl;
     if (num < 3) //was 1
     {
@@ -1416 +1416 @@
     }
 
+    //cout << "Cat: " << stars.GetRealEntries() << endl;
     if (stars.GetRealEntries() < 3)
     {
@@ -1437 +1438 @@
 
     // FIXME: Is predefined value 3 a good idea?
+    Int_t cnt=0;
 
     MStar *star;
     MStarListIter NextStar(&stars);
-    while ((star=NextStar()))
+    while ((star=NextStar()) && cnt<num+5)
     {
         TIter NextSp(&leds);
@@ -1457 +1459 @@
             x.AddAt(dpos.X(), idx);
             y.AddAt(dpos.Y(), idx);
-            mag.AddAt(spot->GetMag()/star->GetMag(), idx);
+            mag.AddAt(log(spot->GetMag())/star->GetMag(), idx);
+
 #ifdef EXPERT
             if (fout)
@@ -1463 +1466 @@
                 fout << spot->GetX() << " "
                     << spot->GetY()  << " "
-                    << spot->GetMag()  << " "
+                    << -2.5*log(spot->GetMag())  << " "
                     << star->GetX() << " "
                     << star->GetY()  << " "
@@ -1471 +1474 @@
 #endif
         }
+        cnt++;
     }
 
@@ -1477 +1481 @@
     if (numcor<1)
         return 0;
+
+    //cout << "Cor: " << numcor << endl;
 
     fDZdAz->SetCoordinates(d);
@@ -1829 +1835 @@
         if (fCosy)
             pos = fCosy->GetPointingPos();
-        center = fCaos->Run(img, printl, printr, pos, t, 50, 3.0);
+        center = fCaos->Run(img, printl, printr, pos, t, 19, 3.0);
         cout << "Caos Filter Camera center position: " << center.GetX() << " " << center.GetY() << endl;
 
@@ -1835 +1841 @@
 
     // Find Star at Center---for Tpoint Procedure
-    if (fDisplay->IsEntryChecked(IDM_kFindStar))
+    if (fDisplay->IsEntryChecked(IDM_kFindStar) &&
+        center.GetX()>0 && center.GetY()>0)
     {
         // SCALE FACTOR ASSUMED TO BE 70
@@ -1888 +1895 @@
              << sgcenter.GetY()-293.6<< "pix" << endl;  
 #endif
-        if (fDisplay->IsEntryChecked(IDM_kStargFindStar))
+        if (fDisplay->IsEntryChecked(IDM_kStargFindStar) &&
+            sgcenter.GetX()>0 && sgcenter.GetY()>0)
         {
             star = FindStar(f, f2, sgcenter, t, 4.5, 30, 267/161.9); // [deg]
@@ -1972 +1980 @@
         MTime time(*tm);
 
-        XY xy = fCRaDec->GetCoordinates();
-        fRaDec->Set(xy.X()*360/24, xy.Y());
+        XY xy = fCRaDec->GetCoordinates();  //[h,  deg]
+        fRaDec->Set(xy.X()*360/24, xy.Y()); //[deg,deg]
 
         UpdatePosZoom();
 
         // Always call SetMjd first!
-        fSao->SetPointing(time.GetMjd(), *fRaDec);
+        fSao->SetPointing(time.GetMjd(), *fRaDec);
         fCZdAz->SetCoordinates(fSao->GetZdAz());
 
@@ -2048 +2056 @@
             const Int_t rc = CalcTrackingError(spots, stars, fD, t, bright, numstars);
 
-            const Bool_t monitoring = brightnessisvalid && centerisvalid;
+            const Bool_t monitoring = brightnessisvalid && centerisvalid && fNumStarsCorrelated>2;
 
             fStatus = monitoring ? MDriveCom::kMonitoring : MDriveCom::kError;
@@ -2082 +2090 @@
             f2.DrawHexagon(skycenter, 2.06/ap, 0x0a);
             f2.DrawHexagon(skycenter, 3.50/ap, 0x0a);
-
-            /*
-             f2.DrawCircle(skycenter, 2.06*.5*74.0, 0x0a);
-             f2.DrawCircle(skycenter, 2.32*.5*74.0, 0x0a);
-             f2.DrawCircle(skycenter, 3.50*.5*74.0, 0x0a);
-             f2.DrawCircle(skycenter, 3.84*.5*74.0, 0x0a);
-             */
         }
 
@@ -2094 +2095 @@
 
     // Draw Circles around center of Camera
-    if (fDisplay->IsEntryChecked(IDM_kCaosFilter))
+    if (fDisplay->IsEntryChecked(IDM_kCaosFilter) &&
+        center.GetX()>0 && center.GetY()>0)
     {
         f2.DrawCircle(center, 0x0a);
@@ -2104 +2106 @@
     }
 
-    if (fDisplay->IsEntryChecked(IDM_kStargCaosFilter))
+    if (fDisplay->IsEntryChecked(IDM_kStargCaosFilter) &&
+        sgcenter.GetX()>0 && sgcenter.GetY()>0)
     {
         f2.DrawCircle(sgcenter, 0x0a);
@@ -2110 +2113 @@
                       fDisplay->IsEntryChecked(IDM_kFindStar)?3:0xb0);
     }
-
-//      if (fDisplay->IsEntryChecked(IDM_kCatalog))
-//      {
-//          fSao->PaintImg(cimg, 768, 576);
-//          const float r = 60*60/fSao->GetPixSize();
-//      f2.DrawCircle(0.5*r, 0x0a);
-//      f2.DrawCircle(1.0*r, 0x0a);
-//      f2.DrawCircle(1.5*r, 0x0a);
-//      }
 
     if (fDisplay->IsEntryChecked(IDM_kCaosFilter) ||