Changeset 14712

Timestamp:

12/01/12 22:01:29 (12 years ago)

Author:

tbretz

Message:

Be a bit more coservative with the rates; adapted the tracking report to the new format; directly use th dev-paramater sent by the new drivectrl version

File:

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

trunk/FACT++/src/smartfact.cc

@@ -990 +990 @@
     int HandleDriveTracking(const EventImp &d)
     {
-        if (!CheckDataSize(d, "DriveControl:Tracking", 56))
+        if (!CheckDataSize(d, "DriveControl:Tracking", 64))
             return GetCurrentState();
 
@@ -998 +998 @@
         const double Az  = d.Get<double>(4*8);
 
-        const double zd  = Zd                 * M_PI / 180;
-        const double dzd = d.Get<double>(5*8) * M_PI / 180;
-        const double daz = d.Get<double>(6*8) * M_PI / 180;
-
-        // Correct:
-        // const double d  = cos(del) - sin(zd+dzd)*sin(zd)*(1.-cos(daz));
-
-        // Simplified:
-        double dev = cos(dzd) - sin(zd+dzd)*sin(zd)*(1.-cos(daz));
-        dev = acos(dev) * 180 / M_PI * 3600;
+        const double dev = d.Get<double>(7*8);
 
         fDriveControlTrackingDevHist.push_back(dev);
@@ -2309 +2300 @@
                            "Sensor temperature exceeds outside temperature by more than 8&deg;C");
 
-        newerr |= SetError(fFtmControlTriggerRateTooLow>1 && fDimFtmControl.state()==FTM::State::kTriggerOn,
+        newerr |= SetError(fFtmControlTriggerRateTooLow>2 && fDimFtmControl.state()==FTM::State::kTriggerOn,
                            "Trigger rate below 1Hz while trigger switched on");
 
@@ -2514 +2505 @@
 
         // ------------------ Drive -----------------
-        if (fDimDNS.online() && fDimDriveControl.state()>=Drive::State::kArmed)   // Armed, Moving, Tracking
+        if (fDimDNS.online() && fDimDriveControl.state()>=Drive::State::kArmed)   // Armed, Moving, Tracking, OnTrack, Error
         {
             const uint32_t dev = fDriveControlTrackingDevHist.size()>0 ? round(fDriveControlTrackingDevHist.back()) : 0;