Changeset 18374

Timestamp:

11/07/15 20:55:33 (9 years ago)

Author:

tbretz

Message:

Fixed tha handling of the source report, added period.

Location:

trunk/FACT++

Files:

• src/smartfact.cc (modified) (3 diffs)
• www/smartfact/struct/source.page (modified) (1 diff)

trunk/FACT++/src/smartfact.cc

@@ -1094 +1094 @@
     int HandleDriveTracking(const EventImp &d)
     {
-        if (!CheckDataSize(d, "DriveControl:Tracking", 64))
+        if (!CheckDataSize(d, "DriveControl:Tracking", 96))
             return GetCurrentState();
+
+
 
         const double Ra  = d.Get<double>(0*8);
         const double Dec = d.Get<double>(1*8);
-        const double Zd  = d.Get<double>(3*8);
-        const double Az  = d.Get<double>(4*8);
-
-        const double dev = d.Get<double>(7*8);
+        const double Zd  = d.Get<double>(6*8);
+        const double Az  = d.Get<double>(7*8);
+
+        const double dev = d.Get<double>(11*8);
 
         fDriveControlTrackingDevHist.push_back(dev);
@@ -1141 +1143 @@
     int HandleDriveSource(const EventImp &d)
     {
-        if (!CheckDataSize(d, "DriveControl:Source", 7*4+2, true))
+        if (!CheckDataSize(d, "DriveControl:Source", 5*8+31))
             return GetCurrentState();
 
         const double *ptr = d.Ptr<double>();
 
-        const double ra   = ptr[0];  // Ra[h]
-        const double dec  = ptr[1];  // Dec[deg]
-        const double woff = ptr[4];  // Wobble offset [deg]
-        const double wang = ptr[5];  // Wobble angle  [deg]
-
-        fDriveControlSourceName = d.Ptr<char>(6*8);
+        const double ra     = ptr[0];  // Ra[h]
+        const double dec    = ptr[1];  // Dec[deg]
+        const double woff   = ptr[2];  // Wobble offset [deg]
+        const double wang   = ptr[3];  // Wobble angle  [deg]
+        const double period = ptr[4];  // Wobble angle  [deg]
+
+        fDriveControlSourceName = d.Ptr<char>(5*8);
 
         ostringstream out;
@@ -1163 +1166 @@
         out << HTML::kWhite << '\t' << woff << '\n';
         out << HTML::kWhite << '\t' << wang << '\n';
+        out << HTML::kWhite << '\t' << period << '\n';
 
         ofstream(fPath+"/source.data") << out.str();

trunk/FACT++/www/smartfact/struct/source.page

@@ -5 +5 @@
 tracking|Wobble offset|$0°
 tracking|Wobble angle|$0°
+tracking|Orbit period|$0min