Changeset 9558 for trunk

Timestamp:

02/26/10 09:14:24 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• main/MMoonPointing.cc (modified) (7 diffs)
• main/MTracking.cc (modified) (7 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2010/02/26 Thomas Bretz
+
+   * main/MMoonPointing.cc:
+     - emit error messages to console/log-file
+
+   * main/MTracing.[h,cc]:
+     - propagate errors
+     - stop tracking if some calculation fails
+
+
+
  2010/02/25 Thomas Bretz
 

trunk/MagicSoft/Cosy/main/MMoonPointing.cc

@@ -60 +60 @@
 
         if (sinzd<=0)
+        {
+            gLog << warn << "WARNING - |Zd|>=90°" << endl;
             return ZdAz();
+        }
 
         const Double_t costheta = coszd*fCosOffset + sinzd*fSinOffset*fCosAngle;
-        if (costheta*costheta >= 1)
+        if (costheta >= 1)
+        {
+            gLog << warn << "WARNING - cos(Zd) > 1." << endl;
             return ZdAz();
+        }
 
         const Double_t sintheta = TMath::Sqrt(1 - costheta*costheta);
@@ -97 +103 @@
     {
         MakeZombie();
+        gLog << warn << "WARNING - Reading of " << filename << " failed." << endl;
         return;
     }
@@ -103 +110 @@
     {
         MakeZombie();
+        gLog << warn << "WARNING - Reading of TGraph2D 'cosAngle' from " << filename << " failed." << endl;
         return;
     }
@@ -109 +117 @@
     {
         MakeZombie();
+        gLog << warn << "WARNING - Reading of TGraph2D 'sinAngle' from " << filename << " failed." << endl;
         return;
     }
@@ -127 +136 @@
     const Double_t norm = TMath::Hypot(fcos, fsin);
     if (TMath::Abs(norm-1)<0.001)
+    {
+        gLog << warn << "WARNING - Local moon position Zd/Az=";
+        gLog << moon.Zd()*TMath::RadToDeg() << "/" << moon.Az()*TMath::RadToDeg();
+        gLog << " out of range of table for interpolation." << endl;
         return kFALSE;
+    }
 
     // Apply a small numerical improvement
@@ -137 +151 @@
     srcpos = calc1.Calc(moon, &sn, &cs);
     if (srcpos.Zd()==0)
+    {
+        gLog << warn << "WARNING - Calculation of moon shadow position failed." << endl;
         return kFALSE;
+    }
 
     // Calaculate Telescope pointing position:
@@ -143 +160 @@
     pointpos = calc2.Calc(srcpos);
     if (pointpos.Zd()==0)
+    {
+        gLog << warn << "WARNING - Calculation of moon shadow's wobble position failed." << endl;
         return kFALSE;
+    }
 
     return kTRUE;

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -218 +218 @@
 }
 
-void MTracking::UpdateSlalib(SlaPlanets &sla)
+Bool_t MTracking::UpdateSlalib(SlaPlanets &sla)
 {
     if (fTrackType<0)
@@ -240 +240 @@
 
         const ZdAz za = sla.GetZdAzRad();
-        if (moon.CalcPosition(za, srcpos, pointpos))
-            sla.Set(pointpos);
+        if (!moon.CalcPosition(za, srcpos, pointpos))
+            return kFALSE;
+
+        sla.Set(pointpos);
 
         // Ra/Dec, Zd/Az from pointpos
@@ -261 +263 @@
 }
 
-void MTracking::UpdateSlalib(Double_t dt)
+Bool_tMTracking::UpdateSlalib(Double_t dt)
 {
     fSlalib.Now(dt);
-    UpdateSlalib(fSlalib);
+    if (!UpdateSlalib(fSlalib))
+        return kFALSE;
 
     fCosy->fRaDec     = fSlalib.GetRaDecRad();
@@ -273 +276 @@
 {
     sla.SetMjd(mjd);
-    UpdateSlalib(sla);
+    return UpdateSlalib(sla);
 }
 
@@ -342 +345 @@
 {
     // Position to corrent nominal position
-    UpdateSlalib();
+    if (!UpdateSlalib())
+        return;
 
     if (!Move())
@@ -362 +366 @@
 
     // Get current nominal local position
-    UpdateSlalib();
+    if (!UpdateSlalib())
+    {
+        fCosy->StopMovement();
+        return;
+    }
 
     ZdAz pos = fSlalib.GetZdAzRad();
@@ -402 +410 @@
         // Request Target position for Now+dt
         //
-        UpdateSlalib(dt);
+        if (!UpdateSlalib(dt))
+            break;
 
         //