Changeset 2615 for trunk/MagicSoft/Cosy/catalog

Timestamp:

12/07/03 14:48:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/catalog

Files:

• SlaStars.cc (modified) (1 diff)
• SlaStars.h (modified) (1 diff)
• Slalib.cc (modified) (9 diffs)
• Slalib.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/catalog/SlaStars.cc

@@ -31 +31 @@
 }
 
-void SlaStars::SetMjd(const double mjd)
+void SlaStars::SetMjd(double mjd)
 {
     Slalib::SetMjd(mjd);

trunk/MagicSoft/Cosy/catalog/SlaStars.h

@@ -23 +23 @@
     //    const RaDec GetRaDec() const { return fRaDec*360/D2PI; }
 
-    virtual void SetMjd(const double mjd);
+    virtual void SetMjd(double mjd);
 
     void   Set(const AltAz &altaz);

trunk/MagicSoft/Cosy/catalog/Slalib.cc

@@ -10 +10 @@
 ClassImp(Slalib);
 
-Slalib::Slalib(MObservatory::LocationName_t key) : Timer(), MObservatory(key)
-{
-}
-
-Slalib::~Slalib()
+Slalib::Slalib(MObservatory::LocationName_t key) : MObservatory(key)
 {
 }
@@ -32 +28 @@
 void Slalib::SetMjd(double mjd)
 {
-    Timer::SetMjd(mjd);
+    fTime.SetMjd(mjd);
     fAlpha = slaGmst(mjd) + GetElong();
 }
@@ -57 +53 @@
     return ZdAz(kPiDiv2-alt, az);
 }
-
+/*
 Double_t Slalib::Hms2Sec(Int_t deg, UInt_t min, Double_t sec, Char_t sgn)
 {
@@ -66 +62 @@
 Double_t Slalib::Dms2Rad(Int_t deg, UInt_t min, Double_t sec, Char_t sgn)
 {
-    /* pi/(180*3600):  arcseconds to radians */
+    // pi/(180*3600):  arcseconds to radians
 #define DAS2R 4.8481368110953599358991410235794797595635330237270e-6
     return Hms2Sec(deg, min, sec, sgn)*DAS2R;
@@ -73 +69 @@
 Double_t Slalib::Hms2Rad(Int_t hor, UInt_t min, Double_t sec, Char_t sgn)
 {
-    /* pi/(12*3600):  seconds of time to radians */
+    // pi/(12*3600):  seconds of time to radians
 #define DS2R 7.2722052166430399038487115353692196393452995355905e-5
     return Hms2Sec(hor, min, sec, sgn)*DS2R;
@@ -100 +96 @@
 void Slalib::Day2Hms(Double_t day, Char_t &sgn, UShort_t &hor, UShort_t &min, UShort_t &sec)
 {
-    /* Handle sign */
+    // Handle sign
     sgn = day<0?'-':'+';
 
-    /* Round interval and express in smallest units required */
+    // Round interval and express in smallest units required
     Double_t a = Round(86400. * TMath::Abs(day)); // Days to seconds
 
-    /* Separate into fields */
+    // Separate into fields
     const Double_t ah = Trunc(a/3600.);
     a -= ah * 3600.;
@@ -113 +109 @@
     const Double_t as = Trunc(a);
 
-    /* Return results */
+    // Return results
     hor = (UShort_t)ah;
     min = (UShort_t)am;
@@ -151 +147 @@
 void Slalib::Day2Hm(Double_t day, Char_t &sgn, UShort_t &hor, Double_t &min)
 {
-    /* Handle sign */
+    // Handle sign
     sgn = day<0?'-':'+';
 
-    /* Round interval and express in smallest units required */
+    // Round interval and express in smallest units required
     Double_t a = Round(86400. * TMath::Abs(day)); // Days to seconds
 
-    /* Separate into fields */
+    // Separate into fields
     const Double_t ah = Trunc(a/3600.);
     a -= ah * 3600.;
 
-    /* Return results */
+    // Return results
     hor = (UShort_t)ah;
     min = a/60.;
@@ -196 +192 @@
 }
 
+*/

trunk/MagicSoft/Cosy/catalog/Slalib.h

@@ -5 +5 @@
 
 #include "coord.h"
-#include "timer.h"
+#include "MTime.h"
 #include "MObservatory.h"
 
-class Slalib : public Timer, public MObservatory
+class Slalib : public MObservatory
 {
 private:
+    MTime fTime;
+
     double fAlpha;
 
@@ -18 +20 @@
 public:
     Slalib(MObservatory::LocationName_t key);
-    virtual ~Slalib();
-
-    static Double_t Hms2Sec(Int_t deg, UInt_t min, Double_t sec, char sgn='+');
-    static Double_t Dms2Rad(Int_t deg, UInt_t min, Double_t sec, Char_t sgn='+');
-    static Double_t Hms2Rad(Int_t hor, UInt_t min, Double_t sec, Char_t sgn='+');
-    static Double_t Dms2Deg(Int_t deg, UInt_t min, Double_t sec, Char_t sgn='+');
-    static Double_t Hms2Deg(Int_t hor, UInt_t min, Double_t sec, Char_t sgn='+');
-    static Double_t Dms2Hor(Int_t deg, UInt_t min, Double_t sec, Char_t sgn='+');
-    static Double_t Hms2Hor(Int_t hor, UInt_t min, Double_t sec, Char_t sgn='+');
-
-    static void Day2Hms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Rad2Dms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Rad2Hms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Deg2Dms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Deg2Hms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Hor2Dms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-    static void Hor2Hms(Double_t rad, Char_t &sgn, UShort_t &deg, UShort_t &min, UShort_t &sec);
-
-    static void Day2Hm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Rad2Dm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Rad2Hm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Deg2Dm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Deg2Hm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Hor2Dm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
-    static void Hor2Hm(Double_t rad, Char_t &sgn, UShort_t &deg, Double_t &min);
 
     virtual void SetMjd(double mjd);
+    Double_t GetMjd() const { return fTime.GetMjd(); }
+    void Now() { fTime.Now(); }
+    const MTime &GetTime() const { return fTime; }
 
     double GetAlpha() const  { return fAlpha; }