Changeset 9523 for trunk

Timestamp:

12/01/09 13:03:41 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (2 diffs)
• catalog/SlaPlanets.cc (modified) (4 diffs)
• catalog/SlaPlanets.h (modified) (1 diff)
• catalog/SlaStars.cc (modified) (4 diffs)
• catalog/SlaStars.h (modified) (2 diffs)
• main/MTracking.cc (modified) (8 diffs)
• main/MTracking.h (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -2 +2 @@
  2009/12/01 Thomas Bretz
 
-   * catalog/SlaStars.h:
+   * catalog/SlaStars.[h,cc]:
      - fixed unit of GetZdAz
      - added GetZdAzRad and GetRaDecRad
+     - added some comments
+     - added TT
+     - use TT instead of UTC in slaMappa. This should be more
+       accurate but is not needed according to the documentation
+       (maybe for the moon?)
 
    * main/MTracking.cc:
@@ -17 +22 @@
    * tcpip/MDriveCom.cc:
      - fixed the number of expected arguments in CELEST command
+
+   * catalog/SlaPlanets.[h,cc]:
+     - moved TT to the base class
+     - commented out the calculation of the earth's heliocentric
+       coordinates which were never used.
+     - removed fDt which was not used either
 
 

trunk/MagicSoft/Cosy/catalog/SlaPlanets.cc

@@ -9 +9 @@
 using namespace std;
 
-SlaPlanets::SlaPlanets(MObservatory::LocationName_t key) : SlaStars(key), fDt(slaDt(2000.0)/60./60./24.)
+SlaPlanets::SlaPlanets(MObservatory::LocationName_t key) : SlaStars(key)//, fDt(slaDt(2000.0)/60./60./24.)
 {
 }
@@ -17 +17 @@
     SlaStars::SetMjd(mjd);
 
-    fTt = GetMjd() + slaDtt(GetMjd())/60./60./24.;
-
     //
-    // coordinates of earth: heliocentric, equatoril, J2000
+    // coordinates of earth: heliocentric, equatorial, J2000
     //
+    /*
     double veb[3]; // barycentric velocity
     double ceb[3]; // barycentric coordinates
@@ -27 +26 @@
 
     slaEvp(GetMjd() + fDt, 2000.0, veb, ceb, veh, fEarth);
+    */
 }
 
@@ -40 +40 @@
     // One can use TT instead of TDB for all planets (except the moon?)
     // TDB, planet, elong, phi, *ra, *dec, *diam
-    slaRdplan(fTt, planet, GetElong(), GetPhi(), &ra, &dec, &diam);
+    slaRdplan(GetTT(), planet, GetElong(), GetPhi(), &ra, &dec, &diam);
 
     return RaDec(ra, dec);

trunk/MagicSoft/Cosy/catalog/SlaPlanets.h

@@ -27 +27 @@
 {
 private:
-    double fDt;        // [mjd] const: rootcint/TMemberInspector
-    double fTt;        // [mjd] timescale TT
+    //double fDt;        // [mjd] The result is a rough estimate of ET-UT (after 1984, TT-UT1) at the given epoch, in seconds
 
     ZdAz fZdAz[10];    // [rad]
 
-    double fEarth[3];  // heliocentric coordinates
+    //double fEarth[3];  // heliocentric coordinates
 
-    ZdAz   GetMoonPos() const;
+    //ZdAz   GetMoonPos() const;
 
 public:

trunk/MagicSoft/Cosy/catalog/SlaStars.cc

@@ -12 +12 @@
 }
 
-SlaStars::~SlaStars()
-{
-}
-
 void SlaStars::Set(const AltAz &altaz)
 {
@@ -42 +38 @@
     Slalib::SetMjd(mjd);
 
+    fTt = GetMjd() + slaDtt(GetMjd())/60./60./24.;
+
     //
     // ----- calculate star independent parameters ----------
@@ -47 +45 @@
 
     // prepare calculation: Mean Place to geocentric apperent
-    slaMappa(2000.0, GetMjd(), fAmprms);   // Epoche, TDB
+    // (UTC would also do, except for the moon?)
+    slaMappa(2000.0, fTt, fAmprms);        // Epoche, TDB
 
     // prepare: Apperent to observed place
@@ -54 +53 @@
              0, 0,                         // polar motion x, y-coordinate (radians)
              // 273.155, 1013.25, 0.5,     // temp, pressure, humidity
-             273.155+10, 780.0, 0.25,     // temp, pressure, humidity
+             273.155+10, 780.0, 0.25,      // temp, pressure, humidity
              // 0.2, 0.0065,               // wavelength, tropo lapse rate
              0.55, 0.0065,                 // wavelength, tropo lapse rate
              fAoprms);
+
+    // Delta UT should be less than 0.9s which is its definition
+    // so we can fairly assume it to be neglegible
 }
 

trunk/MagicSoft/Cosy/catalog/SlaStars.h

@@ -21 +21 @@
     double   fAoprms[14];
 
+    double   fTt;        // [mjd] timescale TT
+
 public:
     SlaStars(MObservatory::LocationName_t key);
-    virtual ~SlaStars();
+    virtual ~SlaStars() { }
 
     //    const AltAz GetAltAz() const { return fAltAz*360/D2PI; }
@@ -31 +33 @@
     const RaDec  GetRaDecRad() const  { return fRaDec; }
     const double GetHourAngle() const { return fHourAngle; }
+
+    const double GetTT() const        { return fTt; }
 
     virtual void SetMjd(double mjd);

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -225 +225 @@
 //    if (fCosy->fStarguider)
 //        fCosy->fStarguider->SetPointingPosition(sla.GetRaDec());
-
-//    gLog << all << "=====> " << (int)(&sla==&fSlalib) << " " << fTrackType << " MJD=" << Form("%.13f", sla.GetMjd()) << " HA=" << sla.GetHourAngle() << " Alpha=" << sla.GetAlpha() << " fTrackPos.Ra()=" << fTrackPos.Ra() << " fTrackPos.Dec()=" << fTrackPos.Dec() << " Alt=" << sla.GetZdAzRad().Zd() << " Az=" << sla.GetZdAzRad().Az() << endl;
-}
-
-void MTracking::UpdateSlalib(Double_t dt=0)
+}
+
+void MTracking::UpdateSlalib(Double_t dt)
 {
     fSlalib.Now(dt);
@@ -248 +246 @@
     const RaDec &dst = fSlalib.GetRaDecRad();
 
-    ZdAz dest = fSlalib.GetZdAzRad();//fSlalib.CalcZdAz(dst);
-
-    if (fTrackType<0)
-       gLog << all << fSlalib.GetTime() << ": Tracking Planet" << endl;
+    ZdAz dest = fSlalib.GetZdAzRad();
+
+    if (fTrackType>=0)
+       gLog << all << fSlalib.GetTime() << ": Tracking Planet with Id " << fTrackType << endl;
     gLog << all << fSlalib.GetTime() << ": Track Position " << dst.Ra()*kRad2Deg/15 << "h, " << dst.Dec()*kRad2Deg <<"deg" << endl;
 
@@ -279 +277 @@
 void MTracking::TrackPosition(const RaDec &dst)
 {
-
-//    gLog << all << "=====> dst.Ra()=" << dst.Ra() << " dst.Dec()=" << dst.Dec() << "   (deg?)" << endl;
-
     fTrackPos  = dst;
     fTrackType = -1;
@@ -322 +317 @@
     // Get current nominal local position
     UpdateSlalib();
-    //fCosy->fRaDec = fSlalib.GetRaDec();
-
-    ZdAz pos = fSlalib.GetZdAzRad();//fSlalib.CalcZdAz(fSlalib.GetRaDec());
+
+    ZdAz pos = fSlalib.GetZdAzRad();
 
     // Some output
@@ -363 +357 @@
         //
         UpdateSlalib(dt);
-        //fCosy->fRaDec = fSlalib.GetRaDec();
 
         //
         // Request nominal position for this time in the future (To+dt)
         //
-        const ZdAz pointing = fSlalib.GetZdAzRad(); //fSlalib.CalcZdAz(fSlalib.GetRaDec()); // [rad]
+        const ZdAz pointing = fSlalib.GetZdAzRad();
         ZdAz dest = fCosy->AlignTrackingPos(pointing);     // fix ambiguity
 
@@ -461 +454 @@
     //SlaPlanets sla(fSlalib.GetObservatoryKey());
     SlaPlanets sla(MObservatory::kMagic1);
-//    gLog << all << "====> KEYS " << (int)fSlalib.GetObservatoryKey() << " " << (int)sla.GetObservatoryKey() << " " << (int)fCosy->fObservatory << endl;
 
     UpdateSlalib(sla);
-
-    //ZdAz soll = sla.GetZdAz(); //sla.CalcZdAz(sla.GetRaDec()); // [rad]
 
     //
@@ -507 +497 @@
             UpdateSlalib(sla, mjdzd);
 
-            ZdAz dummy = sla.GetZdAzRad();//sla.CalcZdAz(radec, mjdzd);
+            ZdAz dummy = sla.GetZdAzRad();
             dummy = fCosy->AlignTrackingPos(dummy);
             fCosy->fZdAzSoll.Zd(dummy.Zd());
@@ -518 +508 @@
             UpdateSlalib(sla, mjdaz);
 
-            ZdAz dummy = sla.GetZdAzRad();//sla.CalcZdAz(radec, mjdaz);
+            ZdAz dummy = sla.GetZdAzRad();
             dummy = fCosy->AlignTrackingPos(dummy);
             fCosy->fZdAzSoll.Az(dummy.Az());

trunk/MagicSoft/Cosy/main/MTracking.h

@@ -31 +31 @@
 
     void UpdateSlalib(SlaPlanets &sla);
-    void UpdateSlalib(Double_t dt);
+    void UpdateSlalib(Double_t dt=0);
     void UpdateSlalib(SlaPlanets &sla, Double_t mjd);