Changeset 7764 for trunk/MagicSoft/Cosy/main

Timestamp:

06/28/06 13:49:23 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• MStargHistograms.cc (modified) (2 diffs)
• MStargHistograms.h (modified) (2 diffs)
• MStarguider.cc (modified) (17 diffs)

trunk/MagicSoft/Cosy/main/MStargHistograms.cc

@@ -127 +127 @@
 }
 
-void MStargHistograms::Fill(Leds &spots, MStarList &stars, ZdAz &d, ZdAz sao, Ring &center,  ZdAz &centerzdaz, ZdAz &star, Double_t bright, const ZdAz &pos, const MTime &t)
+void MStargHistograms::Fill(Leds &spots, MStarList &stars, ZdAz &d, ZdAz sao, Ring &center,  ZdAz &star, Double_t bright, const ZdAz &pos, const MTime &t)
 {
       // FIXME!
@@ -146 +146 @@
           fCenterX    = center.GetX();
           fCenterY    = center.GetY();
-          fCenterZd   = centerzdaz.Zd();
-          fCenterAz   = centerzdaz.Az();
+          //fCenterZd   = centerzdaz.Zd();
+          //fCenterAz   = centerzdaz.Az();
           fStarZd     = star.Zd();
           fStarAz     = star.Az();

trunk/MagicSoft/Cosy/main/MStargHistograms.h

@@ -31 +31 @@
     Double_t       fSpots;
     Double_t       fBright;
-    Double_t       fCenterZd;
-    Double_t       fCenterAz;
+//    Double_t       fCenterZd;
+//    Double_t       fCenterAz;
     Double_t       fStarZd;
     Double_t       fStarAz;
@@ -49 +49 @@
 
     void Fill(Leds &spots, MStarList &stars, ZdAz &d, ZdAz sao, 
-              Ring &center, ZdAz &centerzdaz, ZdAz &star, Double_t bright,
+              Ring &center, /*ZdAz &centerzdaz,*/ ZdAz &star, Double_t bright,
               const ZdAz &pos, const MTime &t);
     

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -665 +665 @@
     else
     {
-
         fStatus = MDriveCom::kStandby;
 
@@ -684 +683 @@
             fOperations->DisableEntry(IDM_kStargAnalysis);
     }
-    gSystem->Unlink("tracking_error.txt");
+    //gSystem->Unlink("tracking_error.txt");
 }
 
@@ -1371 +1370 @@
     AltAz pos0 = fSao->CalcAltAzFromPix(768/2,    576/2)*kRad2Deg;
     AltAz pos1 = fSao->CalcAltAzFromPix(768/2+mx, 576/2+my)*kRad2Deg;
-
+/*
     ofstream fout1("pointingpos.txt");
     fout1 << setprecision(10) << fSao->GetMjd()-52000 << " ";
@@ -1385 +1384 @@
         fout2 << fCosy->GetPointingPos() << " ";
     fout2 << -pos1.Alt() << " " << pos1.Az() << endl;
-
+  */
     return ZdAz(-pos1.Alt(), pos1.Az());
 }
@@ -1853 +1852 @@
 
     Ring sgcenter(53.2, 293.6); // Center of camera in SG picture [px]
-    ZdAz sgcenterzdaz(0, 0);    // Center of camera in SG picture [deg] 
-                                // (0,0)_deg is at (53.2, 293.6)_px
+    //ZdAz sgcenterzdaz(0, 0);    // Center of camera in SG picture [deg]
+    //                            // (0,0)_deg is at (53.2, 293.6)_px
     ZdAz star(0, 0);            // Star on curtain in [deg]
 
@@ -1862 +1861 @@
         if (fCosy)
             pos = fCosy->GetPointingPos();
-        sgcenter =
-            fStargCaos->Run(img, kFALSE, kFALSE, pos, t, 30, 3.0); // [px]
+
+        sgcenter = fStargCaos->Run(img, kFALSE, kFALSE, pos, t, 30, 3.0); // [px]
+
         const Float_t pixsize = atof(fPixSize->GetText()); // [arcsec/px]
 
@@ -1871 +1871 @@
         // 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 ); 
+        //sgcenterzdaz.Zd((sgcenter.GetY()-293.6) * pixsize /3600 );
+        //sgcenterzdaz.Az((sgcenter.GetX()-53.2)  * pixsize /3600 );
 #ifdef EXPERT
         cout << "- LEDs imply offset of Zd=" 
@@ -1918 +1918 @@
     }
 
-// Find Spot on Camera Center in Starguider camera
+    // Find Spot on Camera Center in Starguider camera
 
     if (fOperations->IsEntryChecked(IDM_kRoqueLampAna))
@@ -1947 +1947 @@
         f2.DrawCircle(sgcenter, 115.0, 0x0fa);
     }
-
-
 
     // we calculate the offset given by the three ETH Leds visible to
@@ -1958 +1956 @@
 
     // Position corresponding to the camera center (53.2, 293.6)
-    Ring skycenter(392, 318);
+    //Ring skycenter(392, 318);
+    Ring skycenter(768/2, 576/2);
     // MStarList spots;
 
@@ -1980 +1979 @@
         // very careful: If center of camera cannot be determined
         // sgcenter jumps to (0,0)  
-        double sgcenteroffsetX = 0.0;
-        double sgcenteroffsetY = 0.0;
-        if ((double)sgcenter.GetX() > 0.0 && (double)sgcenter.GetY() > 0.0)
-        {
-            //Please never change this offsets!!!
-            sgcenteroffsetX = sgcenter.GetX()-53.2;
-            sgcenteroffsetY = sgcenter.GetY()-293.6;
-        }
+
+        //Please never change this offsets!!!
+        // 53.2 and 293.6 are the "preliminary" camera center
+        // -9 and 28.5 are the offsets of the pointing position in the sky
+        const XY offset(53.2-9, 293.6+28.5);
+
+        const Bool_t centerisvalid = sgcenter.GetX()>0 && sgcenter.GetY()>0;
+        if (centerisvalid)
+            skycenter.SetXY(sgcenter.X() - offset.X(),
+                            sgcenter.Y() - offset.Y());
 
         // we obtain stars in the effective star FOV and draw them.
@@ -1993 +1994 @@
         // We determine the ideal starfield using camera sagging info
         // from the LEDs
-
-        //cout << sgcenteroffsetX << " " << sgcenteroffsetY << endl;
-
-        fSao->CalcStars(stars, 530, 292, 
-                        -8+2-3+sgcenteroffsetX,  //x: star<spot =>subs
-                        31.5-3+sgcenteroffsetY);   //y: star<spot =>subs?
-
+        fSao->CalcStars(stars, 530, 292, skycenter.GetX(), skycenter.GetY());
         fSao->DrawStars(stars, cimg);
 
@@ -2008 +2003 @@
         // Next we evaluate the offset given by the LEDs. This we obtain
         // in Zd/Az and add it to the tracking error.
-       
         if (fDisplay->IsEntryChecked(IDM_kStarguider))
         {
@@ -2020 +2014 @@
             fSkyBright->SetText(txt);
 
+            const Bool_t brightnessisvalid = bright<1.75*fLastBright &&
+                bright>30 && bright<110;
+
+            fLastBright = bright;
+
             ULong_t color;
             gClient->GetColorByName("Green", color);    
@@ -2033 +2032 @@
             const Int_t rc = CalcTrackingError(spots, stars, fD, t, bright, numstars);
 
-            if ((bright <= 1.75* fLastBright) && (bright < 110))
-                fStatus = MDriveCom::kMonitoring;
-            else
-                fStatus = MDriveCom::kError;
+            const Bool_t monitoring = brightnessisvalid && centerisvalid;
+
+            fStatus = monitoring ? MDriveCom::kMonitoring : MDriveCom::kError;
 
             if (fCosy)
@@ -2043 +2041 @@
             if (fOperations->IsEntryChecked(IDM_kStargAnalysis))
                 fStargHistograms->Fill(spots, stars, fD,
-                                       fSao->GetZdAz(), sgcenter, sgcenterzdaz,
+                                       fSao->GetZdAz(), sgcenter, /*sgcenterzdaz,*/
                                        star, bright, fPos, t);
-
-            fLastBright = bright;
 
             if (fCosy)
@@ -2055 +2051 @@
                                     time.GetMjd(), 0, 0);    // Report
             }
+
         } //kStarguider
 
-        f2.DrawCircle(skycenter, 2.0, 0x0a);
-        
-        f2.DrawCircle(skycenter, 7.4, 0x0a); //0.1deg
-
-        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);
+        if (centerisvalid)
+        {
+            f2.DrawCircle(skycenter, 2.0, 0x0a);
+
+            f2.DrawCircle(skycenter, 7.4, 0x0a); //0.1deg
+
+            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);
+        }
+
     } //CalcStars