Changeset 8376 for trunk/MagicSoft/Cosy/main

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• MBending.cc (modified) (2 diffs)
• MCaos.cc (modified) (5 diffs)
• MCaos.h (modified) (1 diff)
• MCosy.cc (modified) (3 diffs)
• MPointing.cc (modified) (4 diffs)
• MStargHistograms.cc (modified) (1 diff)
• MStarguider.cc (modified) (10 diffs)

trunk/MagicSoft/Cosy/main/MBending.cc

@@ -59 +59 @@
 #include "MBending.h"
 
-#include <fstream.h>
-#include <iomanip.h>
+#include <fstream>
+#include <iomanip>
 #include <TVector3.h>
 
@@ -68 +68 @@
 
 ClassImp(MBending);
+
+using namespace std;
 
 #undef DEBUG

trunk/MagicSoft/Cosy/main/MCaos.cc

@@ -1 +1 @@
 #include "MCaos.h"
 
-#include <iostream>
+#include <fstream>
 #include <iomanip>
 
@@ -21 +21 @@
 #include "coord.h"
 
-void MCaos::ReadResources(const char *name="leds.txt")
+using namespace std;
+
+void MCaos::ReadResources(const char *name)
 {
     ifstream fin(name);
@@ -242 +244 @@
     c->Update();
 
-    const Int_t n1 = (Int_t)(sqrt(fPositions.GetEntriesFast())+1.0);
-    const Int_t n2 = (Int_t)(sqrt(fPositions.GetEntriesFast())+0.5);
+    const Int_t n1 = (Int_t)(TMath::Sqrt(fPositions.GetEntriesFast())+1.0);
+    const Int_t n2 = (Int_t)(TMath::Sqrt(fPositions.GetEntriesFast())+0.5);
 
     TCanvas *c1 = new TCanvas("cpos", "Led Positions", 800, 600);
@@ -330 +332 @@
 }
 
-Ring MCaos::Run(byte *img, bool printl, bool printr, const ZdAz &pos, const MTime &t, Double_t box, Double_t cut)
+Ring MCaos::Run(byte *img, bool printl, bool printr, const ZdAz &pos, const MTime &t, Int_t box, Double_t cut)
 {
     Leds &leds = *fLeds;
@@ -355 +357 @@
         // Try to find Led in this area
         const Led &l0 = fPositions(i);
-        f.Execute(leds, l0.GetX(), l0.GetY());
+        f.Execute(leds, TMath::FloorNint(l0.GetX()), TMath::FloorNint(l0.GetY()));
 
         // Loop over newly found Leds

trunk/MagicSoft/Cosy/main/MCaos.h

@@ -89 +89 @@
 
     Ring Run(byte *img, bool printl, bool printr, const ZdAz &pos, 
-             const MTime &t, Double_t box, Double_t cut);
+             const MTime &t, Int_t box, Double_t cut);
 };
 

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -1 +1 @@
 #include "MCosy.h"
 
-#include <iomanip.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <iomanip>
+#include <fstream>
 
 #include <TROOT.h>
@@ -30 +29 @@
 
 ClassImp(MCosy);
+
+using namespace std;
 
 typedef struct tm tm_t;
@@ -493 +494 @@
     {
 #ifdef EXPERT
-        fMac1->SetDeceleration(0.5*fMac1->GetVelRes());
-        fMac2->SetDeceleration(0.5*fMac2->GetVelRes());
+        fMac1->SetDeceleration(TMath::Nint(0.5*fMac1->GetVelRes()));
+        fMac2->SetDeceleration(TMath::Nint(0.5*fMac2->GetVelRes()));
 #else
-        fMac1->SetDeceleration(0.3*fMac1->GetVelRes());
-        fMac2->SetDeceleration(0.3*fMac2->GetVelRes());
+        fMac1->SetDeceleration(TMath::Nint(0.3*fMac1->GetVelRes()));
+        fMac2->SetDeceleration(TMath::Nint(0.3*fMac2->GetVelRes()));
 #endif
         fMac1->SetRpmMode(FALSE);

trunk/MagicSoft/Cosy/main/MPointing.cc

@@ -6 +6 @@
 
 ClassImp(MPointing);
+
+using namespace std;
 
 //#define EXPERT
@@ -30 +32 @@
     if (ratio<1)
     {
-        fCosy->fMac1->SetVelocity(vel);
-        fCosy->fMac2->SetVelocity(vel*ratio);
+        fCosy->fMac1->SetVelocity(TMath::Nint(vel));
+        fCosy->fMac2->SetVelocity(TMath::Nint(vel*ratio));
     }
     else
     {
-        fCosy->fMac1->SetVelocity(vel/ratio);
-        fCosy->fMac2->SetVelocity(vel);
+        fCosy->fMac1->SetVelocity(TMath::Nint(vel/ratio));
+        fCosy->fMac2->SetVelocity(TMath::Nint(vel));
     }
 }
@@ -56 +58 @@
     fCosy->SetStatus(MDriveCom::kMoving);
 
-    if (axe1) fCosy->fMac2->StartRelPos(rd.Zd());
-    if (axe2) fCosy->fMac1->StartRelPos(rd.Az());
+    if (axe1) fCosy->fMac2->StartRelPos(TMath::Nint(rd.Zd()));
+    if (axe2) fCosy->fMac1->StartRelPos(TMath::Nint(rd.Az()));
 #ifdef EXPERT
     cout << "Waiting for positioning..." << flush;
@@ -73 +75 @@
 {
     const int vr = mac->GetVelRes();
-    mac->SetAcceleration(acc*vr);
-    mac->SetDeceleration(dec*vr);
+    mac->SetAcceleration(TMath::Nint(acc*vr));
+    mac->SetDeceleration(TMath::Nint(dec*vr));
     return !mac->IsZombieNode();
 }

trunk/MagicSoft/Cosy/main/MStargHistograms.cc

@@ -22 +22 @@
 
 #include "coord.h"
+
+using namespace std;
 
 void MStargHistograms::OpenFile()

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);