Changeset 13552

Timestamp:

05/03/12 22:46:23 (13 years ago)

Author:

tbretz

Message:

Some fixes, updates and improvements to get a first version fully working.

File:

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

trunk/FACT++/src/smartfact.cc

@@ -196 +196 @@
     void HandleDriveControlPointing(const DimData &d)
     {
-        if (!CheckDataSize(d, "DriveControl:Pointing", 7*4+2))
+        if (!CheckDataSize(d, "DriveControl:Pointing", 16))
             return;
 
@@ -211 +211 @@
         };
 
-        const uint16_t i = uint16_t(floor(fmod(az+11.25, 360)/22));
+        const uint16_t i = uint16_t(floor(fmod(az+360+11.25, 360)/22));
         fDriveControlPointingAz = dir[i];
 
@@ -227 +227 @@
     void HandleDriveControlTracking(const DimData &d)
     {
-        if (!CheckDataSize(d, "DriveControl:Tracking", 7*4+2))
+        if (!CheckDataSize(d, "DriveControl:Tracking", 56))
             return;
 
@@ -239 +239 @@
         // Simplified:
         const double dev = cos(dzd) - sin(zd)*sin(zd)*(1.-cos(daz));
-        fDriveControlTrackingDev = acos(dev) * 180 / M_PI;
+        fDriveControlTrackingDev = acos(dev) * 180 / M_PI * 3600;
+        if (fDriveControlTrackingDev<0.01)
+            fDriveControlTrackingDev=0;
     }
 
     void HandleDriveControlSource(const DimData &d)
     {
-        if (!CheckDataSize(d, "DriveControl:Source", 7*4+2))
-            return;
+        //if (!CheckDataSize(d, "DriveControl:Source", 7*4+2))
+        //    return;
 
         const double *ptr = d.ptr<double>();
@@ -266 +268 @@
         out << "#ffffff\t" << woff << '\n';
         out << "#ffffff\t" << wang << '\n';
-            
+
         ofstream fout("www/drive.txt");
         fout << out.str();
@@ -364 +366 @@
         WriteBinary("ftmcontrol-patchrates",
                     vector<float>(prates, prates+160), 10);
+
+//        for (int i=0; i<160; i++) cout << prates[i] << endl;
+
+        ostringstream out;
+        out << setprecision(3);
+        out << uint64_t(d.time.UnixTime()*1000) << '\n';
+        out << "#ffffff\t" << fFtmControlTriggerRateCam << '\n';
+
+        ofstream fout("www/trigger.txt");
+        fout << out.str();
     }
 
@@ -371 +383 @@
             return;
 
-        if (fFadControlEventCounter++%30)
-            return;
+        //if (fFadControlEventCounter++%30)
+        //    return;
 
         //const float *avg = d.ptr<float>();
@@ -518 +530 @@
         {
             const State rc = fNetwork.GetState("DRIVE_CONTROL", fStatusDriveControl.second);
-            out << kWhite << "\t";
+            out << kWhite << '\t';
             out << rc.name << '\t';
             out << fDriveControlPointingZd  << '\t';
             out << fDriveControlPointingAz  << '\t';
-            out << fDriveControlTrackingDev << '\t';
-            out << fDriveControlSourceName  << '\n';
+            if (fStatusDriveControl.second==7)
+            {
+                out << fDriveControlTrackingDev << '\t';
+                out << fDriveControlSourceName  << '\n';
+            }
+            else
+                out << "\t\n";
         }
         else
-            out << kWhite << "\n";
+            out << kWhite << '\n';
 
         // --------------- MagicWeather -------------
@@ -545 +562 @@
                 col2 = kRed;
 
-            out << col1 << "\t";
+            out << col1 << '\t';
             out << fMagicWeatherData[kTemp]  << '\t';
             out << fMagicWeatherData[kDew]   << '\n';
-            out << col2 << "\t";
+            out << col2 << '\t';
             out << fMagicWeatherData[kGusts] << '\n';
         }
@@ -582 +599 @@
                 col = kBlue;
 
-            out << col << "\t";
+            out << col << '\t';
             out << fBiasControlCurrentMed << '\t';
             out << fBiasControlCurrentMax << '\t';
@@ -588 +605 @@
         }
         else
-            out << kWhite << "\n";
+            out << kWhite << '\n';