Changeset 8377 for trunk/MagicSoft

Timestamp:

03/14/07 19:16:34 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (3 diffs)
• main/MStarguider.h (modified) (3 diffs)
• main/MTracking.cc (modified) (2 diffs)
• videodev/FilterLed.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -8 +8 @@
      catalog/StarCatalog.cc, gui/MGAccuracy.cc, gui/MGCoordinate.cc,
      gui/MGCoordinates.cc, gui/MGCosy.cc, gui/MGNumStars.cc,
-     gui/MGSkyPosition.cc, main/MBending.cc, main/MStargHistograms.cc:
+     gui/MGSkyPosition.cc, main/MBending.cc, main/MStargHistograms.cc,
+     base/coord.h, main/MCaos.cc, main/MCosy.cc, main/MPointing.cc,
+     main/MStarguider.cc, main/MTracking.cc:
      - replaced obsolete .h by C++ headers
      - added namespace std
@@ -15 +17 @@
      - fixed warnings about overwriting of Delete
 
-   * base/MStopwatch.h, gui/MGCoordinate.h, gui/MGCoordinates.h:
+   * base/MStopwatch.h, gui/MGCoordinate.h, gui/MGCoordinates.h,
+     main/MStarguider.h:
      - fixed warning about overwriting of Print()
 
@@ -21 +24 @@
      - fixed default argument is declaration
 
-   * catalog/StarCatalog.cc, gui/MGAccuracy.cc:
+   * catalog/StarCatalog.cc, gui/MGAccuracy.cc, main/MCaos.[h,cc],
+     main/MCosy.cc, main/MPointing.cc, main/MStarguider.cc,
+     main/MTracking.cc:
      - fixed a type problem (int instead of double) 
 

trunk/MagicSoft/Cosy/main/MStarguider.h

@@ -103 +103 @@
     AltAz         fAltAzOffsetFromTp;
 
-    Double_t fNumStarsDetected;
-    Double_t fNumStarsCorrelated;
+    Int_t          fNumStarsDetected;
+    Int_t          fNumStarsCorrelated;
 
     StarCatalog   *fSao;
@@ -146 +146 @@
 
     XY FindRoqueLamp(FilterLed &f, FilterLed &f2, Ring &CameraCenter, MTime &t, 
-                     Double_t cut, Double_t box, XY SearchCenter);
+                     Double_t cut, Int_t box, XY SearchCenter);
 
     ZdAz FindStar(FilterLed &f, FilterLed &f2, Ring &center, MTime &t, 
-                  Double_t cut, Double_t box, Double_t scalefactor);
+                  Double_t cut, Int_t box, Double_t scalefactor);
 
     //void InitHists();
@@ -191 +191 @@
 
     void Print(TString &str, Double_t deg) const;
+    void Print(Option_t *o) const { }
 
     ClassDef(MStarguider, 0)

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -10 +10 @@
 
 ClassImp(MTracking);
+
+using namespace std;
 
 //#define EXPERT
@@ -358 +360 @@
     // Estimate Offset before starting to track
     ZdAz repos = fCosy->GetRePos();
-    fCosy->fZd1->SetOffset(repos.Zd());
-    fCosy->fZd2->SetOffset(repos.Zd());
-    fCosy->fAz->SetOffset(repos.Az());
+    fCosy->fZd1->SetOffset(TMath::Nint(repos.Zd()));
+    fCosy->fZd2->SetOffset(TMath::Nint(repos.Zd()));
+    fCosy->fAz->SetOffset(TMath::Nint(repos.Az()));
 
     fCosy->SetTrackingPosRE(GetPointingPosRE());

trunk/MagicSoft/Cosy/videodev/FilterLed.cc

@@ -2 +2 @@
 
 #include <memory.h>   // memset
-#include <iostream.h> // cout
+#include <iostream> // cout
 
 #include "Led.h"
@@ -11 +11 @@
 
 ClassImp(FilterLed);
+
+using namespace std;
 
 class ClusterFinder