Changeset 12844 for trunk

Timestamp:

02/06/12 09:24:33 (13 years ago)

Author:

tbretz

Message:

There was a mismatch with the units in SOURCE_POSITION

File:

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

trunk/FACT++/src/drivectrl.cc

@@ -652 +652 @@
                      "|dAz[deg]:Control deviation Az"),
         fDimSource("DRIVE_CONTROL/SOURCE_POSITION", "D:1;D:1;D:1;D:1;D:1;D:1;C:31",
+                     "|Ra_src[h]:Source right ascension"
+                     "|Dec_src[deg]:Source declination"
                      "|Ra_cmd[h]:Command right ascension"
                      "|Dec_cmd[deg]:Command declination"
-                     "|Ra_src[h]:Source right ascension"
-                     "|Dec_src[deg]:Source declination"
-                     "|Offfset[deg]:Wobble offset"
+                     "|Offset[deg]:Wobble offset"
                      "|Angle[deg]:Wobble angle"
                      "|Name[string]:Source name if available"),
@@ -835 +835 @@
         if (off==0)
         {
-            const array<double, 6> dim = {{ ra, dec, ra, dec, 0, 0 }};
+            const array<double, 6> dim = {{ srcra, srcdec, srcra, srcdec, 0, 0 }};
             fDrive.UpdateSource(dim, name);
 
@@ -858 +858 @@
         const double nra  = (atan2(sindeltara, cosdeltara) + ra)*12/M_PI;
 
-        const array<double, 6> dim = {{ ra, dec, nra, ndec, off, dir }};
+        const array<double, 6> dim = {{ srcra, srcdec, nra, ndec, woboff, wobang }};
         fDrive.UpdateSource(dim, name);