Changeset 7788 for trunk/MagicSoft/Cosy/main/MStarguider.cc

Timestamp:

07/12/06 03:00:16 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ +1 @@
+#undef EXPERT
 #undef EXPERT
 
@@ -335 +336 @@
 
     fCZdAz = new MGCoordinates(this, kETypeZdAz, kFALSE);
-    fCZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+581+12);
+    fCZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+581+20-4);
     AddFrame(fCZdAz);
     fList->Add(fCZdAz);
 
     fPZdAz = new MGCoordinates(this, kETypeZdAz, kFALSE);
-    fPZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+627+2*12);
+    fPZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+627+2*20-4);
     AddFrame(fPZdAz);
     fList->Add(fPZdAz);
 
     fDZdAz = new MGCoordinates(this, kETypeZdAz, kFALSE);
-    fDZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+673+3*12);
+    fDZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+673+3*20-4);
     AddFrame(fDZdAz);
     fList->Add(fDZdAz);
 
     fSZdAz = new MGCoordinates(this, kETypeZdAz, kFALSE);
-    fSZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+719+4*12);
+    fSZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+719+4*20-4);
     AddFrame(fSZdAz);
     fList->Add(fSZdAz);
 
     fTPoint = new TGTextButton(this, "TPoint");
-    fTPoint->Move(4, fMenu->GetDefaultHeight()+722+3*12+25);
+    fTPoint->Move(4, fMenu->GetDefaultHeight()+722+3*15+15);
     fTPoint->AllowStayDown(kTRUE);
     AddFrame(fTPoint);
@@ -361 +362 @@
 
     fStargTPoint = new TGTextButton(this, "StargTPoint");
-    fStargTPoint->Move(240+12+20, fMenu->GetDefaultHeight()+785);
+    fStargTPoint->Move(240+12+28, fMenu->GetDefaultHeight()+785);
     fStargTPoint->AllowStayDown(kTRUE);
     AddFrame(fStargTPoint);
@@ -368 +369 @@
     fFps = new TGLabel(this, "---fps");
     fFps->SetTextJustify(kTextRight);
-    fFps->Move(650-440, fMenu->GetDefaultHeight()+619+13+60+20);
+    fFps->Move(650-495, fMenu->GetDefaultHeight()+619+13+60+20+2);
     AddFrame(fFps);
     fList->Add(fFps);
 
-    fPosZoom = new TGLabel(this, "----.--d/----.--d (----, ----)");
-    fPosZoom->SetTextJustify(kTextRight);
+    fPosZoom = new TGLabel(this, "(----, ----) ----.--d/----.--d");
+    fPosZoom->SetTextJustify(kTextLeft);
     fPosZoom->Move(4, fMenu->GetDefaultHeight()+765);
     AddFrame(fPosZoom);
@@ -386 +387 @@
     TGLabel *l = new TGLabel(this, "arcsec/pix");
     l->SetTextJustify(kTextLeft);
-    l->Move(605-400, fMenu->GetDefaultHeight()+619+13+60);
+    l->Move(606-412, fMenu->GetDefaultHeight()+619+13+60);
     AddFrame(l);
     fList->Add(l);
@@ -392 +393 @@
     l = new TGLabel(this, "deg");
     l->SetTextJustify(kTextLeft);
-    l->Move(605-410, fMenu->GetDefaultHeight()+619-10+60);
+    l->Move(606-412, fMenu->GetDefaultHeight()+619-10+60);
     AddFrame(l);
     fList->Add(l);
@@ -398 +399 @@
     l = new TGLabel(this, "Telescope pointing at");
     l->SetTextJustify(kTextLeft);
-    l->Move(240+12+20, fMenu->GetDefaultHeight()+584-5);
+    l->Move(240+12+20+7, fMenu->GetDefaultHeight()+584-5);
     AddFrame(l);
     fList->Add(l);
@@ -404 +405 @@
     l = new TGLabel(this, "Starguider position");
     l->SetTextJustify(kTextLeft);
-    l->Move(240+12+20, fMenu->GetDefaultHeight()+630+12-5);
+    l->Move(240+12+20+7, fMenu->GetDefaultHeight()+630+20-5);
     AddFrame(l);
     fList->Add(l);
@@ -410 +411 @@
     l = new TGLabel(this, "Misspointing");
     l->SetTextJustify(kTextLeft);
-    l->Move(240+12+20, fMenu->GetDefaultHeight()+676+2*12-5);
+    l->Move(240+12+20+7, fMenu->GetDefaultHeight()+676+2*20-5);
     AddFrame(l);
     fList->Add(l);
@@ -417 +418 @@
     l = new TGLabel(this, "Misspointing/FindStar (Experts Only!)");
     l->SetTextJustify(kTextLeft);
-    l->Move(240+12+20, fMenu->GetDefaultHeight()+722+3*12-5);
+    l->Move(240+12+20, fMenu->GetDefaultHeight()+722+3*20-5);
     AddFrame(l);
     fList->Add(l);
@@ -436 +437 @@
     fList->Add(fPixSize);
 
-    fAngle = new TGTextEntry(this, "         0", IDM_kAngle);
+    const Double_t angle = -0.4;
+    fSao->SetRotationAngle(angle);
+
+    txt = "";
+    txt += angle;
+
+    fAngle = new TGTextEntry(this, txt, IDM_kAngle);
     fAngle->SetAlignment(kTextCenterX);
     fAngle->Move(547-410, fMenu->GetDefaultHeight()+617-10+60);
@@ -1385 +1392 @@
     {
         // open tpoint file
-        const TString name = MCosy::GetFileName("tpoint/starg_%s.txt");
+        const TString name = MCosy::GetFileName("tpoint", "starg", "txt");
         cout << "TPoint-Starg File ********* " << name << " ********** " << endl;
 
@@ -1451 +1458 @@
     // Try to find Led in this area
     Leds leds;
-    f.FindStarCircle(leds, (Int_t)SearchCenter.X(), (Int_t)SearchCenter.Y());
+    f.FindStar(leds, (Int_t)SearchCenter.X(), (Int_t)SearchCenter.Y(), true);
 
     // Check whether star found
@@ -1470 +1477 @@
     if (!fOutRq)
     {
-        const TString name = MCosy::GetFileName("tpoint/starg_roquelamp_%s.txt");
+        const TString name = MCosy::GetFileName("tpoint", "roquelamp", "txt");
         cout << "Starg_RoqueLamp File ********* " << name << " ********** " << endl;
         fOutRq = new ofstream(name);
@@ -1476 +1483 @@
     }
 
-
     return relroquepos;
 }
-  
 
 ZdAz MStarguider::FindStar(FilterLed &f, FilterLed &f2, Ring &center, MTime &t, Double_t cut, Double_t box, Double_t scalefactor = 1.0)
@@ -1489 +1494 @@
     // Try to find Led in this area
     Leds leds;
-    f.FindStarCircle(leds, (Int_t)center.GetX(), (Int_t)center.GetY());
+    f.FindStar(leds, (Int_t)center.GetX(), (Int_t)center.GetY(), true);
 
     if (leds.GetEntries()<0)
@@ -1505 +1510 @@
         return ZdAz(.0,.0);
     }
-
     cout << "Found star @ " << flush;
     star->Print();
@@ -1561 +1565 @@
         // open tpoint file
         //
-        const TString name = MCosy::GetFileName("tpoint/tpoint_%s.txt");
+        const TString name = MCosy::GetFileName("tpoint", "tpoint", "txt");
         cout << "TPoint-Starg File ********* " << name << " ********** " << endl;
 
@@ -1715 +1719 @@
     // Find Star at Center---for Tpoint Procedure
     if (fDisplay->IsEntryChecked(IDM_kFindStar))
-        /*ZdAz zdaz =*/ FindStar(f, f2, center, t, 3.5, 70);
+        FindStar(f, f2, center, t, 3.5, 70);
 
     byte zimg[kZOOM*kZOOM];
@@ -1779 +1783 @@
     {
 
-        XY roquelamp(0,0);
-
         Double_t imageclean = 1.5;
         Double_t boxradius = 60;
@@ -1786 +1788 @@
         XY searchcenter(768/2-1,576/2+25);
 
-        roquelamp = FindRoqueLamp(f, f2, sgcenter, t, imageclean, boxradius, searchcenter);
+        XY roquelamp = FindRoqueLamp(f, f2, sgcenter, t, imageclean, boxradius, searchcenter);
 
         if (fOutRq)
@@ -1804 +1806 @@
 
     // Find Spot on Camera Center in Starguider camera
-
     if (fOperations->IsEntryChecked(IDM_kRoqueLampAna))
     {
@@ -1832 +1833 @@
         f2.DrawCircle(sgcenter, 115.0, 0x0fa);
     }
-
     // we calculate the offset given by the three ETH Leds visible to
     // the guide camera
@@ -1884 +1884 @@
 
         // Position around which the circles are drawn.
-        const Ring skycenter(768/2+off.X(), 576/2+off.Y());
+        const Ring skycenter(768/2-off.X(), 576/2+off.Y());
 
         // There are two corrections to the misspointing
@@ -1896 +1896 @@
             Leds spots;
             f.SetBox(230);
-//          f.SetCut(1.5);
-            double bright;
+            f.SetCut(2.5);
+
+            double bright;
             f.ExecuteAndMark(spots, 530, 292, bright);
-            MString txt;
+
+            MString txt;
             txt.Print("Sky Brightness: %.1f", bright);
             fSkyBright->SetText(txt);
@@ -1961 +1963 @@
     {
         f2.DrawCircle(center, 0x0a);
-        f2.DrawCircle(center,   5.0, 
+        f2.DrawCircle(center,   7.0,
                       fDisplay->IsEntryChecked(IDM_kFindStar)?3:0xb0);
         f2.DrawCircle(center, 115.0, 0x0a);
@@ -2003 +2005 @@
         if (aa.Az()<0)
             aa.Az(aa.Az()+360);
-        txt.Print("%.1fd/%.1fd (%d, %d)", -aa.Alt(), aa.Az()-180, fDx, fDy);
+        txt.Print("(%d, %d) %.1fd/%.1fd", fDx, fDy, -aa.Alt(), aa.Az()-180);
     }
     else