Changeset 9522 for trunk/MagicSoft

Timestamp:

12/01/09 10:57:14 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• catalog/SlaStars.h (modified) (1 diff)
• main/MTracking.cc (modified) (10 diffs)
• tcpip/MDriveCom.cc (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2009/12/01 Thomas Bretz
+
+   * catalog/SlaStars.h:
+     - fixed unit of GetZdAz
+     - added GetZdAzRad and GetRaDecRad
+
+   * main/MTracking.cc:
+     - fixed unit of fTrackPos calling sla.Set
+     - don't distribute ra/dec to starguider it seems to be responsible
+       for crashes
+     - fixed units of getting coordinates from slalib
+     - keep calculating a future position in the tracking loop
+     - for the moment set the observatory key explicitly
+       (Mars doesn't store it)
+
+   * tcpip/MDriveCom.cc:
+     - fixed the number of expected arguments in CELEST command
+
+
+
  2009/10/21 Thomas Bretz
 
    * catalog/SlaPlanets.[h,cc]:
      - Now derives from SlaStars
-     - new function to get the current sky position of a celestial object
+     - new function to get the current sky position of a celestial
+       object
 
    * catalog/SlaStars.[h,cc]:

trunk/MagicSoft/Cosy/catalog/SlaStars.h

@@ -26 +26 @@
 
     //    const AltAz GetAltAz() const { return fAltAz*360/D2PI; }
-    const ZdAz   GetZdAz()  const     { return ZdAz(TMath::Pi()/2-fAltAz.Alt(), fAltAz.Az())*TMath::DegToRad(); }
+    const ZdAz   GetZdAz()  const     { return ZdAz(TMath::Pi()/2-fAltAz.Alt(), fAltAz.Az())/TMath::DegToRad(); }
+    const ZdAz   GetZdAzRad() const   { return ZdAz(TMath::Pi()/2-fAltAz.Alt(), fAltAz.Az()); }
     const RaDec  GetRaDec() const     { return fRaDec/TMath::DegToRad(); }
+    const RaDec  GetRaDecRad() const  { return fRaDec; }
     const double GetHourAngle() const { return fHourAngle; }
 

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -219 +219 @@
 {
     if (fTrackType<0)
-        sla.Set(fTrackPos);
+        sla.Set(fTrackPos/TMath::DegToRad());
     else
         sla.SetPlanet((ePlanets_t)fTrackType);
 
-    if (fCosy->fStarguider)
-        fCosy->fStarguider->SetPointingPosition(sla.GetRaDec());
+//    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;
 }
 
@@ -232 +234 @@
     UpdateSlalib(fSlalib);
 
-    fCosy->fRaDec     = fSlalib.GetRaDec();
+    fCosy->fRaDec     = fSlalib.GetRaDecRad();
     fCosy->fHourAngle = fSlalib.GetHourAngle();
 }
@@ -244 +246 @@
 bool MTracking::Move()
 {
-    const RaDec &dst = fSlalib.GetRaDec();
-
-    ZdAz dest = fSlalib.GetZdAz();//fSlalib.CalcZdAz(dst);
-
+    const RaDec &dst = fSlalib.GetRaDecRad();
+
+    ZdAz dest = fSlalib.GetZdAzRad();//fSlalib.CalcZdAz(dst);
+
+    if (fTrackType<0)
+       gLog << all << fSlalib.GetTime() << ": Tracking Planet" << endl;
     gLog << all << fSlalib.GetTime() << ": Track Position " << dst.Ra()*kRad2Deg/15 << "h, " << dst.Dec()*kRad2Deg <<"deg" << endl;
 
@@ -275 +279 @@
 void MTracking::TrackPosition(const RaDec &dst)
 {
+
+//    gLog << all << "=====> dst.Ra()=" << dst.Ra() << " dst.Dec()=" << dst.Dec() << "   (deg?)" << endl;
+
     fTrackPos  = dst;
     fTrackType = -1;
@@ -317 +324 @@
     //fCosy->fRaDec = fSlalib.GetRaDec();
 
-    ZdAz pos = fSlalib.GetZdAz();//fSlalib.CalcZdAz(fSlalib.GetRaDec());
+    ZdAz pos = fSlalib.GetZdAzRad();//fSlalib.CalcZdAz(fSlalib.GetRaDec());
 
     // Some output
@@ -355 +362 @@
         // Request Target position for Now+dt
         //
-        UpdateSlalib();
+        UpdateSlalib(dt);
         //fCosy->fRaDec = fSlalib.GetRaDec();
 
@@ -361 +368 @@
         // Request nominal position for this time in the future (To+dt)
         //
-        const ZdAz pointing = fSlalib.GetZdAz(); //fSlalib.CalcZdAz(fSlalib.GetRaDec()); // [rad]
+        const ZdAz pointing = fSlalib.GetZdAzRad(); //fSlalib.CalcZdAz(fSlalib.GetRaDec()); // [rad]
         ZdAz dest = fCosy->AlignTrackingPos(pointing);     // fix ambiguity
 
@@ -452 +459 @@
     gLog << inf2 << "- Tracking Thread started (" << MTime(-1) << ")" << endl;
 
-    SlaPlanets sla(fSlalib.GetObservatoryKey());
+    //SlaPlanets sla(fSlalib.GetObservatoryKey());
+    SlaPlanets sla(MObservatory::kMagic1);
+//    gLog << all << "====> KEYS " << (int)fSlalib.GetObservatoryKey() << " " << (int)sla.GetObservatoryKey() << " " << (int)fCosy->fObservatory << endl;
 
     UpdateSlalib(sla);
@@ -498 +507 @@
             UpdateSlalib(sla, mjdzd);
 
-            ZdAz dummy = sla.GetZdAz();//sla.CalcZdAz(radec, mjdzd);
+            ZdAz dummy = sla.GetZdAzRad();//sla.CalcZdAz(radec, mjdzd);
             dummy = fCosy->AlignTrackingPos(dummy);
             fCosy->fZdAzSoll.Zd(dummy.Zd());
@@ -509 +518 @@
             UpdateSlalib(sla, mjdaz);
 
-            ZdAz dummy = sla.GetZdAz();//sla.CalcZdAz(radec, mjdaz);
+            ZdAz dummy = sla.GetZdAzRad();//sla.CalcZdAz(radec, mjdaz);
             dummy = fCosy->AlignTrackingPos(dummy);
             fCosy->fZdAzSoll.Az(dummy.Az());

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -138 +138 @@
     Float_t dra, ddec;
     Int_t n=sscanf(str.Data(), "%d %f %f %n", &id, &dra, &ddec, &len);
-    if (n!=1)
+    if (n!=3)
     {
         gLog << warn << "WARNING - Not enough argmuents (CELEST)." << endl;