Changeset 8818 for trunk/MagicSoft/Cosy/catalog

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/catalog

Files:

• SlaStars.cc (modified) (7 diffs)
• Slalib.cc (modified) (1 diff)
• StarCatalog.h (modified) (1 diff)

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