Changeset 14710 for trunk

Timestamp:

12/01/12 20:29:49 (12 years ago)

Author:

tbretz

Message:

Tracking now is also 'OnTrack'

File:

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

trunk/FACT++/src/smartfact.cc

@@ -2303 +2303 @@
         newerr |= SetError(fMagicWeatherHist[kHum].size()>0 && fMagicWeatherHist[kHum].back()>98 && data_taking,
                            "Outside humidity exceeds 98% during data-taking");
-        newerr |= SetError(fMagicWeatherHist[kGusts].size()>0 && fMagicWeatherHist[kGusts].back()>98 && fDimDriveControl.state()==Drive::State::kTracking,
+        newerr |= SetError(fMagicWeatherHist[kGusts].size()>0 && fMagicWeatherHist[kGusts].back()>98 && (fDimDriveControl.state()==Drive::State::kTracking||fDimDriveControl.state()==Drive::State::kOnTrack),
                            "Wind gusts exceed 50km/h during tracking");
 
@@ -2523 +2523 @@
             if (fDimDriveControl.state()==Drive::State::kArmed) // Armed
                 col = HTML::kWhite;
-            if (fDimDriveControl.state()==Drive::State::kTracking) // Tracking
+            if (fDimDriveControl.state()==Drive::State::kTracking || fDimDriveControl.state()==Drive::State::kOnTrack) // Tracking
             {
                 if (dev>60)   // ~1.5mm
@@ -2538 +2538 @@
             out << fDriveControlPointingZd  << "&deg;";
             out << setprecision(2);
-            if (fDimDriveControl.state()==Drive::State::kTracking)
+            if (fDimDriveControl.state()==Drive::State::kTracking || fDimDriveControl.state()==Drive::State::kOnTrack)
             {
                 out << " &plusmn; " << dev << '"';