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

Timestamp:

03/14/07 19:12:17 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -4 +4 @@
 #include "MStarguider.h"
 
-#include <fstream.h>    // ifstream
-#include <iostream.h>   // cout
-#include <iomanip.h>   // cout
+#include <fstream>    // ifstream
+#include <iostream>   // cout
+#include <iomanip>    // cout
 
 #include <TH2F.h>
@@ -57 +57 @@
 
 ClassImp(MStarguider);
+
+using namespace std;
 
 enum {
@@ -1457 +1459 @@
             
             const Int_t idx = x.GetSize();
-            
+
             x.Set(idx+1);
             y.Set(idx+1);
             mag.Set(idx+1);
-            
+
             x.AddAt(dpos.X(), idx);
             y.AddAt(dpos.Y(), idx);
@@ -1507 +1509 @@
     fPZdAz->SetCoordinates(cpos);
 
-
     // Check StargTPoint data set request
     if (!fStargTPoint->IsDown())
@@ -1575 +1576 @@
 }
 
-XY MStarguider::FindRoqueLamp(FilterLed &f, FilterLed &f2, Ring &CameraCenter, MTime &t, Double_t cut, Double_t box, XY SearchCenter)
+XY MStarguider::FindRoqueLamp(FilterLed &f, FilterLed &f2, Ring &CameraCenter, MTime &t, Double_t cut, Int_t box, XY SearchCenter)
 {
     // Set search Paremeters (FIXME: Get them from user input!)
@@ -1611 +1612 @@
 }
 
-ZdAz MStarguider::FindStar(FilterLed &f, FilterLed &f2, Ring &center, MTime &t, Double_t cut, Double_t box, Double_t scalefactor = 1.0)
+ZdAz MStarguider::FindStar(FilterLed &f, FilterLed &f2, Ring &center, MTime &t, Double_t cut, Int_t box, Double_t scalefactor = 1.0)
 {
     // Set search Paremeters (FIXME: Get them from user input!)
@@ -1850 +1851 @@
     {
         // SCALE FACTOR ASSUMED TO BE 70
-        FindStar(f, f2, center, t, 3.5, 70);
+        FindStar(f, f2, center, t, 3/*3.5*/, 70);
         SendAmcTrigger("TPoint");
     }
@@ -1920 +1921 @@
 
         Double_t imageclean = 1.5;
-        Double_t boxradius = 60;
+        Int_t    boxradius = 60;
         //Double_t scalefactor = 1;
         XY searchcenter(768/2-1,576/2+25);
@@ -1947 +1948 @@
 
         Double_t imageclean = 5;
-        Double_t boxradius = 60;
+        Int_t    boxradius = 60;
         //Double_t scalefactor = 1;
         //      XY searchcenter(sgcenter.GetX(),sgcenter.GetY());
@@ -2016 +2017 @@
                      sgcenter.GetY()-293.6+28.5);
 
-        fSao->CalcStars(stars, 530, 292, off.X(), off.Y());
+        fSao->CalcStars(stars, 530, 292, TMath::FloorNint(off.X()), TMath::FloorNint(off.Y()));
         fSao->DrawStars(stars, cimg);