Index: /trunk/MagicSoft/Cosy/main/MMoonPointing.cc
===================================================================
--- /trunk/MagicSoft/Cosy/main/MMoonPointing.cc	(revision 9554)
+++ /trunk/MagicSoft/Cosy/main/MMoonPointing.cc	(revision 9555)
@@ -128,6 +128,13 @@
     const Double_t fcos = const_cast<TGraph2D&>(fCos).Interpolate(moon.Az(), moon.Zd());
     const Double_t fsin = const_cast<TGraph2D&>(fSin).Interpolate(moon.Az(), moon.Zd());
-    if (fcos*fcos + fsin*fsin<0.98)
+
+    // This is a sanity check for the case the Interpolation failed
+    const Double_t norm = TMath::Hypot(fcos, fsin);
+    if (TMath::Abs(norm-1)<0.001)
         return kFALSE;
+
+    // Just a small numerical improvement
+    fsin /= norm;
+    fcos /= norm;
 
     // Calculate Moon Shadow Position:
Index: /trunk/MagicSoft/Cosy/main/MTracking.cc
===================================================================
--- /trunk/MagicSoft/Cosy/main/MTracking.cc	(revision 9554)
+++ /trunk/MagicSoft/Cosy/main/MTracking.cc	(revision 9555)
@@ -239,7 +239,7 @@
         ZdAz srcpos, pointpos;
 
-        const ZdAz za     = sla.GetZdAzRad();
-        const ZdAz offset = moon.CalcPosition(za, srcpos, pointpos);
-        sla.ApplyOffsetZdAz(pointpos-za);
+        const ZdAz za = sla.GetZdAzRad();
+        if (moon.CalcPosition(za, srcpos, pointpos))
+            sla.Set(pointpos);
 
         // Ra/Dec, Zd/Az from pointpos