Changeset 7707 for trunk/MagicSoft/Cosy/main

Timestamp:

05/09/06 14:18:19 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• MStarguider.cc (modified) (6 diffs)
• MStarguider.h (modified) (1 diff)

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -1390 +1390 @@
 
 Int_t MStarguider::CalcTrackingError(Leds &leds, MStarList &stars,
-                                     ZdAz &d, MTime &t, double &bright)
+                                     ZdAz &d, MTime &t, double &bright, Int_t &num)
 {
     const Int_t max = leds.GetEntries();
@@ -1420 +1420 @@
     TArrayF x, y, mag;
 
-    Int_t num = 0;
+    num = 0;
 
     // FIXME: Is predefined value 3 a good idea?
@@ -1459 +1459 @@
     }
 
-    d = TrackingError(x, y, mag, num);
-
-    if (num<1)
+    Int_t numcor = 0;
+    d = TrackingError(x, y, mag, numcor);
+    if (numcor<1)
         return 0;
 
@@ -1547 +1547 @@
     fTimeFromTp.Set(1970,1,1);
 
-    return num;
+    return numcor;
 }
 
@@ -2030 +2030 @@
             fSkyBright->SetBackgroundColor(color);
 
-            const Int_t rc = CalcTrackingError(spots, stars, fD, t, bright);
+            Int_t numstars = 0;
+            const Int_t rc = CalcTrackingError(spots, stars, fD, t, bright, numstars);
 
             if ((bright <= 1.75* fLastBright) && (bright < 110))
@@ -2051 +2052 @@
                 MDriveCom &com = *fCosy->GetDriveCom();
                 com.SendStargReport(fStatus, fD, fSao->GetZdAz(),
-                                    sgcenter, rc, bright,
+                                    sgcenter, numstars, rc, bright,
                                     time.GetMjd(), 0, 0);    // Report
             }

trunk/MagicSoft/Cosy/main/MStarguider.h

@@ -129 +129 @@
     void ToggleCaosFilter();
     //void GetCoordinates();
-    Int_t CalcTrackingError(Leds &, MStarList &, ZdAz &, MTime &, double &bright);
+    Int_t CalcTrackingError(Leds &, MStarList &, ZdAz &, MTime &, double &bright, Int_t &num);
     //void CalcTrackingError(Leds &, MStarList &);
     ZdAz TrackingError(TArrayF &alt, TArrayF &az, TArrayF &mag, Int_t &num) const;