Changeset 17417 for trunk

Timestamp:

12/30/13 17:05:18 (11 years ago)

Author:

tbretz

Message:

Fixed a bug when calculating the azimuth from the tpoint data; fixed the format string for the TPOINT service; renamed the TPOINT service because a command with the same name already exists; fixed a problem with the padding of the 'C' formated data; replaces 'B' as format by the more accurate 'B:1'

File:

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

trunk/FACT++/src/drivectrl.cc

@@ -234 +234 @@
 
         tpoint.fNominalZd  = 90-alt1-dzd;
-        tpoint.fNominalAz  = 90-az1 +daz;
+        tpoint.fNominalAz  = az1 +daz;
 
         tpoint.fPointingZd = 90-alt1;
@@ -733 +733 @@
                      "|Angle[deg]:Wobble angle"
                      "|Name[string]:Source name if available"),
-        fDimTPoint("DRIVE_CONTROL/TPOINT", "D:1;D:1;D:1;D:1;D:1;D:1;D:1;D:1;S:1;D:1;D:1;D:1;D:1;D:1;D:1;D:1;C",
+        fDimTPoint("DRIVE_CONTROL/TPOINT_DATA", "D:1;D:1;D:1;D:1;D:1;D:1;D:1;D:1;S:1;S:1;D:1;D:1;D:1;D:1;D:1;D:1;D:1;C",
                    "|Ra[h]:Command right ascension"
                    "|Dec[deg]:Command declination"
@@ -750 +750 @@
                    "|Ys[pix]:Y position of star in CCD camera frame"
                    "|Ms[mag]:Artifical magnitude of star (calculated form image))"
-                   "|Mc[mag]:Catalog magnitude of star"),
+                   "|Mc[mag]:Catalog magnitude of star"
+                   "|name[string]:Name of star"),
         fDimStatus("DRIVE_CONTROL/STATUS", "C:2;C:1", "")
 
@@ -1120 +1121 @@
         const float  mag  = evt.Get<float>();
         const char  *ptr  = evt.Ptr<char>(4);
-        const size_t size = evt.GetSize()-4;
-
-        string src(ptr, size);
-
-        while (src.find_first_of(' '))
+
+        string src(ptr);
+
+        while (src.find_first_of(' ')!=string::npos)
             src.erase(src.find_first_of(' '), 1);
 
@@ -1472 +1472 @@
             ("Unlock locked state.");
 
-        T::AddEvent("SET_AUTORESUME", "B")
+        T::AddEvent("SET_AUTORESUME", "B:1")
             (bind(&StateMachineDrive::SetAutoResume, this, placeholders::_1))
             ("Enable/disable auto resume"
@@ -1478 +1478 @@
 
         // Verbosity commands
-        T::AddEvent("SET_VERBOSE", "B")
+        T::AddEvent("SET_VERBOSE", "B:1")
             (bind(&StateMachineDrive::SetVerbosity, this, placeholders::_1))
             ("Set verbosity state"