Changeset 16087 for trunk/FACT++/src

Timestamp:

05/23/13 19:08:06 (11 years ago)

Author:

tbretz

Message:

Use empty() instead of size() where possible; replaced queues by list where possible

File:

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

trunk/FACT++/src/smartfact.cc

@@ -365 +365 @@
         void add(const string &s, const Time &t=Time())
         {
-            while (size()>0 && (front().time+deltat<t || size()>max))
+            while (!empty() && (front().time+deltat<t || size()>max))
                 pop_front();
 
@@ -579 +579 @@
         void WriteBinaryVec(const Time &tm, const string &fname, const vector<T> &vec, double scale, double offset=0, const string &title="", const string &col="")
     {
-        if (vec.size()==0)
+        if (vec.empty())
             return;
 
@@ -666 +666 @@
             : min(0), max(0), med(0), avg(0)
         {
-            if (t.size()==0)
+            if (t.empty())
                 return;
 
@@ -907 +907 @@
         out << HTML::kWhite << '\t' << GetDir(fMagicWeatherHist[kDir].back()) << '\n';
         out << HTML::kWhite << '\t';
-        if (fTngWeatherDustHist.size()>0)
+        if (!fTngWeatherDustHist.empty())
             out << fTngWeatherDustHist.back() << '\t' << fTngWeatherDustTime.GetAsStr("%H:%M") << '\n';
         else
@@ -1161 +1161 @@
             v[i] = d.Ptr<uint16_t>()[i] * 5000./4096;
 
-        const bool cal = fFeedbackCalibration.size()>0 && fBiasControlVoltageVec.size()>0;
+        const bool cal = !fFeedbackCalibration.empty() && !fBiasControlVoltageVec.empty();
 
         double power_tot = 0;
@@ -1649 +1649 @@
         rms = sqrt(rms/num-avg*avg);
 
-        if (fMagicWeatherHist[kTemp].size()>0)
+        if (!fMagicWeatherHist[kTemp].empty())
         {
             fFscControlTemperatureHist.push_back(avg-fMagicWeatherHist[kTemp].back());
@@ -2116 +2116 @@
 
         /*const*/ pair<vector<float>, pair<Time, float>> vism = GetVisibility(0, now.JD());
-        if (vism.first.size()>0)
+        if (!vism.first.empty())
         {
             const Entry entry("Moon", vism.second.second, ccol);
@@ -2152 +2152 @@
 
                 /*const*/ pair<vector<float>, pair<Time, float>> vis = GetVisibility(&pos, now.JD());
-                if (vis.first.size()>0)
+                if (!vis.first.empty())
                 {
                     const Entry entry(name, vis.second.second, ccol);
@@ -2163 +2163 @@
 
                     /*const*/ pair<vector<float>, pair<Time, float>> lc = GetLightCondition(&pos, now.JD());
-                    if (lc.first.size()>0)
+                    if (!lc.first.empty())
                     {
                         const Entry entry2(name, lc.second.second, lcol);
@@ -2290 +2290 @@
             fDimBiasControl.state()==BIAS::State::kVoltageOn;
 
-        const bool haderr = fErrorList.size()>0;
+        const bool haderr = !fErrorList.empty();
 
         bool newerr = false;
@@ -2319 +2319 @@
 
 
-        newerr |= SetError(bias_on && fFeedbackCalibration.size()>0 && fBiasControlCurrentMed>90,
+        newerr |= SetError(bias_on && !fFeedbackCalibration.empty() && fBiasControlCurrentMed>90,
                            "Median current exceeds 90&micro;A/pix");
-        newerr |= SetError(bias_on && fFeedbackCalibration.size()>0 && fBiasControlCurrentMax>110,
+        newerr |= SetError(bias_on && !fFeedbackCalibration.empty() && fBiasControlCurrentMax>110,
                            "Maximum current exceeds 110&micro;A/pix");
 
@@ -2327 +2327 @@
                            "Average camera humidity exceed 60%");
 
-        newerr |= SetError(fMagicWeatherHist[kHum].size()>0 && fMagicWeatherHist[kHum].back()>98 && data_taking,
+        newerr |= SetError(!fMagicWeatherHist[kHum].empty() && 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||fDimDriveControl.state()==Drive::State::kOnTrack),
+        newerr |= SetError(!fMagicWeatherHist[kGusts].empty() && fMagicWeatherHist[kGusts].back()>98 && (fDimDriveControl.state()==Drive::State::kTracking||fDimDriveControl.state()==Drive::State::kOnTrack),
                            "Wind gusts exceed 50km/h during tracking");
 
-        newerr |= SetError(fDimFscControl.state()>=FSC::State::kConnected && fFscControlTemperatureHist.size()>0 && fFscControlTemperatureHist.back()>9,
+        newerr |= SetError(fDimFscControl.state()>=FSC::State::kConnected && !fFscControlTemperatureHist.empty() && fFscControlTemperatureHist.back()>9,
                            "Sensor temperature exceeds outside temperature by more than 9&deg;C");
 
@@ -2349 +2349 @@
                            fDimBiasControl.state()==BIAS::State::kVoltageOn &&
                            fBiasControlVoltageMed>3 &&
-                           fFeedbackCalibration.size()==0,
+                           fFeedbackCalibration.empty(),
                            "Bias voltage switched on, but bias crate not calibrated");
 
@@ -2404 +2404 @@
 
         out.str("");
-        out << Header(now) << '\t' << (fErrorList.size()>0) << '\t' << (fDimControl.state()>0) << '\n';
+        out << Header(now) << '\t' << (!fErrorList.empty()) << '\t' << (fDimControl.state()>0) << '\n';
         out << setprecision(3);
         out << HTML::kWhite << '\t';
@@ -2411 +2411 @@
         out << '\n';
 
-        if (haderr || fErrorList.size()>0)
+        if (haderr || !fErrorList.empty())
             ofstream(fPath+"/error.data") << out.str();
 
@@ -2417 +2417 @@
 
         out.str("");
-        out << Header(now) << '\t' << (fErrorList.size()>0) << '\t' << (fDimControl.state()>0) << '\n';
+        out << Header(now) << '\t' << (!fErrorList.empty()) << '\t' << (fDimControl.state()>0) << '\n';
         out << setprecision(3);
 
@@ -2541 +2541 @@
         if (fDimDNS.online() && fDimDriveControl.state()>=Drive::State::kArmed)   // Armed, Moving, Tracking, OnTrack, Error
         {
-            const uint32_t dev = fDriveControlTrackingDevHist.size()>0 ? round(fDriveControlTrackingDevHist.back()) : 0;
+            const uint32_t dev = !fDriveControlTrackingDevHist.empty() ? round(fDriveControlTrackingDevHist.back()) : 0;
             const State rc = fDimDriveControl.description();
             string col = HTML::kGreen;
@@ -2599 +2599 @@
 
         // ------------------- FSC ------------------
-        if (fDimDNS.online() && fDimFscControl.state()>FSC::State::kDisconnected && fFscControlTemperatureHist.size()>0)
+        if (fDimDNS.online() && fDimFscControl.state()>FSC::State::kDisconnected && !fFscControlTemperatureHist.empty())
         {
             string col = HTML::kGreen;
@@ -2613 +2613 @@
 
         // --------------- MagicWeather -------------
-        if (fDimDNS.online() && fDimMagicWeather.state()==MagicWeather::State::kReceiving && fMagicWeatherHist[kWeatherBegin].size()>0)
+        if (fDimDNS.online() && fDimMagicWeather.state()==MagicWeather::State::kReceiving && !fMagicWeatherHist[kWeatherBegin].empty())
         {
             /*
@@ -2645 +2645 @@
         {
             string col = HTML::kGreen;
-            if (fFtmControlTriggerRateHist.size()>0)
+            if (!fFtmControlTriggerRateHist.empty())
             {
                 if (fFtmControlTriggerRateHist.back()<15)
@@ -2692 +2692 @@
                 col = HTML::kRed;
 
-            const bool cal = fFeedbackCalibration.size();
+            const bool cal = !fFeedbackCalibration.empty();
 
             // Feedback is currently calibrating => Blue
@@ -2732 +2732 @@
 
         out.str("");
-        out << Header(now) << '\t' << (fErrorList.size()>0) << '\t' << (fDimControl.state()>0) << '\n';
+        out << Header(now) << '\t' << (!fErrorList.empty()) << '\t' << (fDimControl.state()>0) << '\n';
 
         if (!fDimDNS.online())