Changeset 8818

Timestamp:

01/18/08 17:06:02 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• catalog/SlaStars.cc (modified) (7 diffs)
• catalog/Slalib.cc (modified) (1 diff)
• catalog/StarCatalog.h (modified) (1 diff)
• gui/MGSkyPosition.cc (modified) (3 diffs)
• main/MCaos.cc (modified) (9 diffs)

trunk/MagicSoft/Cosy/catalog/SlaStars.cc

@@ -15 +15 @@
 void SlaStars::Set(const AltAz &altaz)
 {
-    fAltAz = altaz * kDeg2Rad;
+    fAltAz = altaz * TMath::DegToRad();
     fRaDec = CalcRaDec(fAltAz);
 }
@@ -21 +21 @@
 void SlaStars::Set(const ZdAz &zdaz)
 {
-    fAltAz = AltAz(kPiDiv2-zdaz.Zd(), zdaz.Az()) * kDeg2Rad;
+    fAltAz = AltAz(TMath::Pi()/2-zdaz.Zd(), zdaz.Az()) * TMath::DegToRad();
     fRaDec = CalcRaDec(fAltAz);
 }
@@ -27 +27 @@
 void SlaStars::Set(const RaDec &radec)
 {
-    fRaDec = radec * kDeg2Rad;
+    fRaDec = radec * TMath::DegToRad();
     fAltAz = CalcAltAz(fRaDec);
 }
@@ -55 +55 @@
 RaDec SlaStars::CalcRaDec(const AltAz &altaz) const
 {
-    return CalcRaDec(ZdAz(kPiDiv2-altaz.Alt(), altaz.Az()));
+    return CalcRaDec(ZdAz(TMath::Pi()/2-altaz.Alt(), altaz.Az()));
 }
 
@@ -102 +102 @@
     // Right Ascension/Declination [rad] 
     //
-    return CalcRaDecFast(AltAz(kPiDiv2-zdaz.Zd(), zdaz.Az()));
+    return CalcRaDecFast(AltAz(TMath::Pi()/2-zdaz.Zd(), zdaz.Az()));
 }
 
@@ -116 +116 @@
     //
     AltAz altaz = CalcAltAzFast(radec);
-    return ZdAz(kPiDiv2-altaz.Alt(), altaz.Az());
+    return ZdAz(TMath::Pi()/2-altaz.Alt(), altaz.Az());
 }
 
@@ -170 +170 @@
 {
     ZdAz zdaz = CalcZdAz(radec);
-    return AltAz(kPiDiv2-zdaz.Zd(), zdaz.Az());
+    return AltAz(TMath::Pi()/2-zdaz.Zd(), zdaz.Az());
 }
 

trunk/MagicSoft/Cosy/catalog/Slalib.cc

@@ -61 +61 @@
     slaDe2h(ha, dec, GetPhi(), &az, &alt);
 
-    return ZdAz(kPiDiv2-alt, az);
+    return ZdAz(TMath::Pi()/2-alt, az);
 }

trunk/MagicSoft/Cosy/catalog/StarCatalog.h

@@ -56 +56 @@
     void PaintImg(unsigned char *buf, int w, int h);
 
-    const AltAz GetAltAz() const /*[deg]*/ { return fAltAz*kRad2Deg; }
-    const ZdAz  GetZdAz() const  /*[deg]*/ { return ZdAz(kPiDiv2-fAltAz.Alt(), fAltAz.Az())*kRad2Deg; }
+    const AltAz GetAltAz() const /*[deg]*/ { return fAltAz*TMath::RadToDeg(); }
+    const ZdAz  GetZdAz() const  /*[deg]*/ { return ZdAz(TMath::Pi()/2-fAltAz.Alt(), fAltAz.Az())*kRad2Deg; }
     const RaDec GetRaDec() const /*[deg]*/ { return fRaDec*kRad2Deg; }
 

trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

@@ -271 +271 @@
 void MGSkyPosition::SetDot(TArc *arc, const RaDec &radec, Int_t off)
 {
-    RaDec rd(radec.Ra()+off*360/24*kDeg2Rad, radec.Dec());
+    RaDec rd(radec.Ra()+off*360/24*TMath::DegToRad(), radec.Dec());
     ZdAz zdaz = fSlaStar->CalcZdAzFast(rd);
 
@@ -294 +294 @@
     static int Ry=~0;
 
-    const float rad = az*kDeg2Rad;    // [rad]
+    const float rad = az*TMath::DegToRad();    // [rad]
 
     const float s = sin(rad);
@@ -379 +379 @@
     UpdateStars();
 
-    RaDec radec = fSlaStar->CalcRaDecFast(pos*kDeg2Rad);
+    RaDec radec = fSlaStar->CalcRaDecFast(pos*TMath::DegToRad());
     UpdatePosition(radec, pos.Zd(), pos.Az());
     UpdateText(pos.Zd(), pos.Az());

trunk/MagicSoft/Cosy/main/MCaos.cc

@@ -2 +2 @@
 
 #include <fstream>
-#include <iomanip>
 
 #include <TSystem.h>
@@ -12 +11 @@
 #include <TCanvas.h>
 
+#include "MLog.h"
+#include "MLogManip.h"
+
 #include "MTime.h"
+#include "MPointing.h"
 
 #include "Led.h"
@@ -19 +22 @@
 #include "FilterLed.h"
 
-#include "coord.h"
-
 using namespace std;
 
@@ -28 +29 @@
     if (!fin)
     {
-        cout << "ERROR - Cannot open " << name << endl;
+        gLog << err << "ERROR - Cannot open " << name << endl;
         return;
     }
@@ -34 +35 @@
     fPositions.Clear();
 
-    cout << " Reading " << name << ":" << endl;
-    cout << "------------------------------" << endl;
+    gLog << all << " Reading " << name << ":" << endl;
+    gLog << inf << "------------------------------" << endl;
     while (1)
     {
@@ -43 +44 @@
             break;
 
-        cout << " Led #" << fPositions.GetEntriesFast() << ":  ";
-        cout << setw(3) << px << " ";
-        cout << setw(3) << py << "  (";
-        cout << setw(3) << ox << ", ";
-        cout << setw(3) << oy << ")" << endl;
+        gLog << " Led #" << fPositions.GetEntriesFast() << ":  ";
+        gLog << setw(3) << px << " ";
+        gLog << setw(3) << py << "  (";
+        gLog << setw(3) << ox << ", ";
+        gLog << setw(3) << oy << ")" << endl;
         AddPosition(px, py, ox, oy);
     }
-    cout << "Found " << fPositions.GetEntriesFast() << " leds." << endl;
+    gLog << all << "Found " << fPositions.GetEntriesFast() << " leds." << endl;
 }
 
@@ -74 +75 @@
         fFile = NULL;
 
-        cout << "Error: Cannot open file '" << name << "'" << endl;
+        gLog << err << "ERROR - Cannot open file '" << name << "'" << endl;
     }
 
@@ -87 +88 @@
     tree->Branch("EvtTime.",    &fEvtTime,    "fEvtTime/D");
 
-    cout << "Root file '" << name << "' open." << endl;
+    gLog << inf << "Root file '" << name << "' open." << endl;
 }
 
@@ -102 +103 @@
     fFile = NULL;
 
-    cout << "Root file closed (n=" << n << ")" << endl;
+    gLog << inf << "Root file closed (n=" << n << ")" << endl;
 
     if (n<1)
     {
         gSystem->Unlink(name);
-        cout << "Root file deleted - no entries." << endl;
+        gLog << warn << "Root file deleted - no entries." << endl;
     }
 }