Changeset 13890 for trunk

Timestamp:

05/25/12 20:22:26 (12 years ago)

Author:

tbretz

Message:

New extensions for files; added runtime to status page

File:

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

trunk/FACT++/src/smartfact.cc

@@ -307 +307 @@
 {
 private:
+    const Time fRunTime;
+
     enum states_t
     {
@@ -511 +513 @@
         out << '\n';
 
-        ofstream(fPath+"/scriptlog.txt") << out.str();
+        ofstream(fPath+"/scriptlog.data") << out.str();
     }
 
@@ -573 +575 @@
         out << "#ffffff\t" << stat.max << '\n';
 
-        ofstream(fPath+"/"+name+".txt") << out.str();
+        ofstream(fPath+"/"+name+".data") << out.str();
 
         WriteBinary(d, "magicweather-"+name+"-hist", fMagicWeatherHist[i], max-min, min);
@@ -621 +623 @@
             out << "\t\n";
 
-        ofstream(fPath+"/weather.txt") << out.str();
+        ofstream(fPath+"/weather.data") << out.str();
 
         out.str("");
@@ -640 +642 @@
         out << kHtmlWhite << '\t';
 
-        ofstream(fPath+"/astro.txt") << out.str();
+        ofstream(fPath+"/astro.data") << out.str();
 
         WriteWeather(d, "temp",  kTemp,   -5,   35);
@@ -672 +674 @@
         out << d.GetJavaDate() << '\n';
 
-        ofstream(fPath+"/tngdust.txt") << out.str();
+        ofstream(fPath+"/tngdust.data") << out.str();
 
         return GetCurrentState();
@@ -704 +706 @@
         out << az << '\n';
 
-        ofstream(fPath+"/drive-pointing.txt") << out.str();
+        ofstream(fPath+"/drive-pointing.data") << out.str();
 
         return GetCurrentState();
@@ -763 +765 @@
             out << kHtmlWhite << "\t&mdash; \n";
 
-        ofstream(fPath+"/tracking.txt") << out.str();
+        ofstream(fPath+"/tracking.data") << out.str();
 
         return GetCurrentState();
@@ -793 +795 @@
         out << "#ffffff\t" << wang << '\n';
 
-        ofstream(fPath+"/source.txt") << out.str();
+        ofstream(fPath+"/source.data") << out.str();
 
         return GetCurrentState();
@@ -840 +842 @@
         out << kHtmlWhite << '\t' << stat.avg << '\n';
         out << kHtmlWhite << '\t' << stat.max << '\n';
-        ofstream(fPath+"/feedback.txt") << out.str();
+        ofstream(fPath+"/feedback.data") << out.str();
 
         return GetCurrentState();
@@ -878 +880 @@
         out << kHtmlWhite << '\t' << stat.avg << '\n';
         out << kHtmlWhite << '\t' << stat.max << '\n';
-        ofstream(fPath+"/voltage.txt") << out.str();
+        ofstream(fPath+"/voltage.data") << out.str();
 
         return GetCurrentState();
@@ -993 +995 @@
         out << col4 << '\t' << stat.max << '\n';
         out << kHtmlWhite << '\t' << power_tot << "W [" << power_apd << "mW]\n";
-        ofstream(fPath+"/current.txt") << out.str();
+        ofstream(fPath+"/current.data") << out.str();
 
         return GetCurrentState();
@@ -1057 +1059 @@
         out << col[2] << '\t' << rc.substr(20, 10) << '\n';
         out << col[3] << '\t' << rc.substr(30, 10) << '\n';
-        ofstream(fPath+"/fad.txt") << out.str();
+        ofstream(fPath+"/fad.data") << out.str();
 
         return GetCurrentState();
@@ -1095 +1097 @@
         out << "#ffffff\t" << fFtmControlTriggerRateCam << '\n';
 
-        ofstream(fPath+"/trigger.txt") << out.str();
+        ofstream(fPath+"/trigger.data") << out.str();
 
         const Statistics bstat(vector<float>(brates, brates+40));
@@ -1106 +1108 @@
         out << kHtmlWhite << '\t' << bstat.avg << '\n';
         out << kHtmlWhite << '\t' << bstat.max << '\n';
-        ofstream(fPath+"/boardrates.txt") << out.str();
+        ofstream(fPath+"/boardrates.data") << out.str();
 
         out.str("");
@@ -1114 +1116 @@
         out << kHtmlWhite << '\t' << pstat.avg << '\n';
         out << kHtmlWhite << '\t' << pstat.max << '\n';
-        ofstream(fPath+"/patchrates.txt") << out.str();
+        ofstream(fPath+"/patchrates.data") << out.str();
 
         return GetCurrentState();
@@ -1148 +1150 @@
         //out << kHtmlWhite << '\t' << statp.avg << '\n';
         out << kHtmlWhite << '\t' << statp.max << '\n';
-        ofstream(fPath+"/thresholds.txt") << out.str();
+        ofstream(fPath+"/thresholds.data") << out.str();
 
         out.str("");
@@ -1187 +1189 @@
             out << kHtmlWhite  << "\t" << 0.5*vp << "\n";
 
-        ofstream(fPath+"/ftm.txt") << out.str();
+        ofstream(fPath+"/ftm.data") << out.str();
 
         // Active FTUs: IsActive(i)
@@ -1227 +1229 @@
         fFtmControlFtuOk = cnt==40;
 
-        ofstream(fPath+"/ftu.txt") << out.str();
+        ofstream(fPath+"/ftu.data") << out.str();
 
         return GetCurrentState();
@@ -1317 +1319 @@
         out << "#ffffff\t" << stat.max << '\n';
 
-        ofstream(fPath+"/fsc.txt") << out.str();
+        ofstream(fPath+"/fsc.data") << out.str();
 
         WriteBinary(d, "fsccontrol-temperature-hist",
@@ -1386 +1388 @@
         out << "#ffffff\t" << max << '\n';
 
-        ofstream(fPath+"/ratescan.txt") << out.str();
+        ofstream(fPath+"/ratescan.data") << out.str();
 
         out.str("");
@@ -1393 +1395 @@
         out << "#ffffff\t" << pow(10, fRateScanDataHist[fRateScanBoard+1].back()) << '\n';
 
-        ofstream(fPath+"/ratescan_board.txt") << out.str();
+        ofstream(fPath+"/ratescan_board.data") << out.str();
 
         return GetCurrentState();
@@ -1412 +1414 @@
         }
 
-        ofstream(fPath+"/dotest.txt") << out.str();
+        ofstream(fPath+"/dotest.data") << out.str();
     }
 
@@ -1525 +1527 @@
             msg << "dimctrl offline<br/>";
 
+        // FTM in Connected instead of Idle --> power cyclen
+
         /* // Check offline and disconnected status?
           Out() << fDimMcp          << endl;
@@ -1549 +1553 @@
 
         ostringstream out;
-        out << now.JavaDate() << '\t' << haserror << '\n';
+        out << now.JavaDate() << '\t' << haserror << '\t' << (fDimControl.state()>-3) << '\n';
         out << setprecision(3);
         out << kHtmlWhite << '\t' << msg.str() << '\n';
 
         if (haserror || fHasError)
-            ofstream(fPath+"/error.txt") << out.str();
+            ofstream(fPath+"/error.data") << out.str();
 
         fHasError = haserror;
@@ -1561 +1565 @@
 
         out.str("");
-        out << now.JavaDate() << '\t' << fHasError << '\n';
+        out << now.JavaDate() << '\t' << fHasError << '\t' << (fDimControl.state()>-3) << '\n';
         out << setprecision(3);
 
@@ -1791 +1795 @@
             out << kHtmlWhite << '\n';
 
-        ofstream(fPath+"/fact.txt") << out.str();
+        ofstream(fPath+"/fact.data") << out.str();
 
         // ==============================================================
 
         out.str("");
-        out << now.JavaDate() << '\t' << fHasError << '\n';
+        out << now.JavaDate() << '\t' << fHasError << '\t' << (fDimControl.state()>-3) << '\n';
 
         if (!fDimDNS.online())
-            out << kHtmlWhite << "\tOffline\n\n\n\n\n\n\n\n\n\n\n\n";
+            out << kHtmlWhite << "\tOffline\n\n\n\n\n\n\n\n\n\n\n\n\n";
         else
         {
+            ostringstream dt;
+            dt << (Time()-fRunTime);
+
             out << kHtmlGreen << '\t' << fDimDNS.version() << '\n';
 
@@ -1818 +1825 @@
             out << GetStateHtml(fDimRateScan,     4);
             out << GetStateHtml(fDimChatServer,   1);
-        }
-
-        ofstream(fPath+"/status.txt") << out.str();
+
+            out << kHtmlGreen << '\t' << dt.str().substr(0, dt.str().length()-7) << '\n';
+        }
+
+        ofstream(fPath+"/status.data") << out.str();
 
         return kStateRunning;