Changeset 18530 for trunk

Timestamp:

08/01/16 10:30:59 (8 years ago)

Author:

tbretz

Message:

Added a range check for the given source coordinates (0-24, -90-90)

Location:

trunk/FACT++/src

Files:

• HeadersDrive.h (modified) (1 diff)
• drivectrl.cc (modified) (2 diffs)

trunk/FACT++/src/HeadersDrive.h

@@ -24 +24 @@
             kPositioningFailed = /*StateMachineImp::kSM_Error*/0x100+1,
             kAllowedRangeExceeded,
-            //kInvalidCoordinates,
+            kInvalidCoordinates,
             //kSpeedLimitExceeded,
         };

trunk/FACT++/src/drivectrl.cc

@@ -1943 +1943 @@
     int StartTracking(const Source &src, double offset, double angle, double period=0)
     {
+        if (src.ra<0 || src.ra>=24)
+        {
+            ostringstream out;
+            out << "Right ascension out of range [0;24[: Ra=" << src.ra << "h Dec=" << src.dec << "deg";
+            if (!src.name.empty())
+                out << " [" << src.name << "]";
+            T::Error(out);
+            return State::kInvalidCoordinates;
+        }
+        if (src.dec<-90 || src.dec>90)
+        {
+            ostringstream out;
+            out << "Declination out of range [-90;90]: Ra=" << src.ra << "h Dec=" << src.dec << "deg";
+            if (!src.name.empty())
+                out << " [" << src.name << "]";
+            T::Error(out);
+            return State::kInvalidCoordinates;
+        }
+
         ostringstream out;
         out << "Tracking Ra=" << src.ra << "h Dec=" << src.dec << "deg";
@@ -2704 +2723 @@
         T::AddStateName(State::kAllowedRangeExceeded, "OutOfRange",
                         "Telecope went out of range during tracking");
+        T::AddStateName(State::kInvalidCoordinates, "InvalidCoordinates",
+                        "Tracking coordinates out of range");