Changeset 10024 for trunk/Cosy

Timestamp:

10/21/10 11:23:44 (14 years ago)

Author:

tbretz

Message:

Finally fixed MTracking to get the tracking of celestial objects working.

Location:

trunk/Cosy

Files:

• Changelog (modified) (1 diff)
• main/MTracking.cc (modified) (11 diffs)
• main/MTracking.h (modified) (3 diffs)

trunk/Cosy/Changelog

@@ -12 +12 @@
    * Makefile:
      - added magic1 and magic2 rule to produce liks to the resource files
+
+   * main/MTracking.[h,cc]:
+     - made MMoonPointing a data member to make sure the file is
+       read only once
+     - added a destructor to delete/close the file
+     - set offsets only once when tracking isinitialized
+     - added a lot of debug output in case of failure
+     - some units fixes
+     - moved setting the ra/dec for the starguider to the tracking
+       main loop
+     - retrieve the time after initializing the Slalib in the Thread
+     - print a more helpful error message when UpdateSlalib in the
+       Thread fails
+
 
 

trunk/Cosy/main/MTracking.cc

@@ -25 +25 @@
     fTrackAcc(0, 0), fWobbleOffset(-1), fWobbleAngle(0), fOut(0)
 {
+    fMoon = new MMoonPointing("MoonShadowOffsets.root");
+}
+
+MTracking::~MTracking()
+{
+    delete fMoon;
 }
 
@@ -227 +233 @@
     if (fTrackType==(kEMoon|0x100))
     {
-        // FIXME: Read file only once!
-        MMoonPointing moon("MoonShadowOffsets.root");
-        if (moon.IsZombie())
+        if (fMoon->IsZombie())
         {
             gLog << err << "ERROR - Could not initialize MMoonPointing." << endl;
@@ -235 +239 @@
         }
 
-        moon.SetOffsetShadow(TMath::DegToRad()*fWobbleAngle);
-        moon.SetOffsetWobble(TMath::DegToRad()*fWobbleOffset);
+        //moon.SetOffsetShadow(fWobbleAngle);
+        //moon.SetOffsetWobble(fWobbleOffset);
+
+        const ZdAz za = sla.GetZdAzRad();
 
         ZdAz srcpos, pointpos;
-
-        const ZdAz za = sla.GetZdAzRad();
-        if (!moon.CalcPosition(za, srcpos, pointpos))
+        if (!fMoon->CalcPosition(za, srcpos, pointpos))
         {
             gLog << err << "ERROR - Calculation of moon shadow pointing position failed." << endl;
+            gLog << "        WoAngle    =" << fWobbleAngle << endl;
+            gLog << "        WoOffset   =" << fWobbleOffset << endl;
+            gLog << "        TrackType  =" << fTrackType << endl;
+            gLog << "        TT&0xff    =" << (fTrackType&0xff) << endl;
+            gLog << "        mjd        =" << sla.GetMjd() << endl;
+            gLog << "        za.Zd      =" << za.Zd() << endl;
+            gLog << "        za.Az      =" << za.Az() << endl;
+            gLog << "        srcpos.Zd  =" << srcpos.Zd() << endl;
+            gLog << "        srcpos.Az  =" << srcpos.Az() << endl;
+            gLog << "        pointpos.Zd=" << pointpos.Zd() << endl;
+            gLog << "        pointpos.Az=" << pointpos.Az() << endl;
             return kFALSE;
         }
 
-        sla.Set(pointpos);
+        sla.Set(pointpos/TMath::DegToRad());
+
+//        return kTRUE;
+
+        //RaDec rd = sla.GetRaDec();
+        //ZdAz  zd = sla.GetZdAz();
 
         // Ra/Dec, Zd/Az from pointpos
@@ -263 +283 @@
         }
         */
-    //    if (fCosy->fStarguider)
-    //        fCosy->fStarguider->SetPointingPosition(sla.GetRaDec());
+    return kTRUE;
 }
 
@@ -275 +294 @@
     fCosy->fRaDec     = fSlalib.GetRaDecRad();
     fCosy->fHourAngle = fSlalib.GetHourAngle();
+
+    return kTRUE;
 }
 
@@ -290 +311 @@
 
     if (fTrackType>=0)
-       gLog << all << fSlalib.GetTime() << ": Tracking Planet with Id " << fTrackType << endl;
+       gLog << all << fSlalib.GetTime() << ": Tracking Planet with Id " << fTrackType << " (" << fWobbleOffset << ", " << fWobbleAngle << ")" << endl;
     gLog << all << fSlalib.GetTime() << ": Track Position " << dst.Ra()*kRad2Deg/15 << "h, " << dst.Dec()*kRad2Deg <<"deg" << endl;
 
@@ -321 +342 @@
     fTrackType = -1;
 
+    // Just for convenience
+    fMoon->SetOffsetShadow(0);
+    fMoon->SetOffsetWobble(0);
+
     // Start tracking
     Track();
@@ -330 +355 @@
     fTrackType = planet;
 
+    // Just for convenience
+    fMoon->SetOffsetShadow(0);
+    fMoon->SetOffsetWobble(0);
+
     // Start tracking
     Track();
@@ -341 +370 @@
     fWobbleOffset = TMath::DegToRad()*wobble;
     fWobbleAngle  = TMath::DegToRad()*offset;
+
+    fMoon->SetOffsetShadow(fWobbleAngle);
+    fMoon->SetOffsetWobble(fWobbleOffset);
 
     // Start tracking
@@ -473 +505 @@
             break;
 
+        // Now the tracking procedure is finished and we have some time
+        // left to set the nominal pointing position for the starguider
+        // if available. This should be thread safe. Doing this in
+        // UpdateSlalib would also update it from the Thread
+        // which leads to problems.
+        if (fCosy->fStarguider)
+            fCosy->fStarguider->SetPointingPosition(fSlalib.GetRaDec());
+
         //
         // Update speed as often as possible.
@@ -513 +553 @@
     //SlaPlanets sla(fSlalib.GetObservatoryKey());
     SlaPlanets sla(MObservatory::kMagic1);
-
-    UpdateSlalib(sla);
+    sla.Now();
+
+    if (!UpdateSlalib(sla))
+        gLog << err << "UpdateSlalib in Thread failed." << endl;
 
     //

trunk/Cosy/main/MTracking.h

@@ -17 +17 @@
 class RaDec;
 class SlaStars;
+class MMoonPointing;
 
 class MTracking : public MSlewing, public MThread
@@ -32 +33 @@
 
     MLog   *fOut;
+
+    MMoonPointing *fMoon;
 
     Bool_t UpdateSlalib(SlaPlanets &sla);
@@ -49 +52 @@
 public:
     MTracking(MCosy *cosy);
+    ~MTracking();
 
     void TrackPosition(const RaDec &dst); // ra, dec [rad]