Changeset 12881 for trunk/FACT++/src/drivectrl.cc

Timestamp:

02/09/12 12:49:22 (13 years ago)

Author:

tbretz

Message:

Fixed another bug in the wobble calculation; the declination was in fact theta, so dec should be 90-dec

File:

• trunk/FACT++/src/drivectrl.cc (modified) (2 diffs)

trunk/FACT++/src/drivectrl.cc

@@ -843 +843 @@
         }
 
-        const double costheta = cosdec*cosoff + sindec*sinoff*cosdir;
-        if (costheta >= 1)
+        const double sintheta = sindec*cosoff + cosdec*sinoff*cosdir;
+        if (sintheta >= 1)
         {
             T::Error("cos(Zd) > 1");
@@ -850 +850 @@
         }
 
-        const double sintheta = sqrt(1 - costheta*costheta);
-
-        const double cosdeltara = (cosoff - cosdec*costheta)/(sindec*sintheta);
-        const double sindeltara = sindir*sinoff/sintheta;
-
-        const double ndec = acos(costheta)*180/M_PI;
+        const double costheta = sqrt(1 - sintheta*sintheta);
+
+        const double cosdeltara = (cosoff - sindec*sintheta)/(cosdec*costheta);
+        const double sindeltara = sindir*sinoff/costheta;
+
+        const double ndec = asin(sintheta)*180/M_PI;
         const double nra  = (atan2(sindeltara, cosdeltara) + ra)*12/M_PI;