Changeset 17520

Timestamp:

01/20/14 16:14:00 (11 years ago)

Author:

tbretz

Message:

Check humidity only when the lid is open, not when a run is started, this gives a warning otherwise at the start of each run. Fixed some minor display issues like the number of valid digits.

File:

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

trunk/FACT++/src/smartfact.cc

@@ -1632 +1632 @@
 
             max[idx] += v/4;
-        } */
-
-        vector<float> max(1440);
+            } */
+
+        vector<float> val(1440);
         for (int i=0; i<1440; i++)
-            max[i] = dat[i%9==8 ? i-2 : i]/1000;
+            val[i] = dat[i%9==8 ? i-2 : i]/1000;
+
+        vector<float> sorted(val);
+        nth_element(sorted.begin(), sorted.begin()+3, sorted.end(),
+                    std::greater<float>());
 
         const uint32_t trig = d.GetQoS() & FAD::EventHeader::kLPext;
@@ -1645 +1649 @@
         if (trig&FAD::EventHeader::kLPext)
             scale = 1;
-        if (trig==0 || (trig&FAD::EventHeader::kPedestal))
+        if (trig&FAD::EventHeader::kPedestal)
             scale = 0.25;
+        if (trig==0)
+            scale = max(0.25f, sorted[3]);
 
         // assume it is drs-gain
@@ -1652 +1658 @@
         //    min = 0.75;
 
-        WriteCam(d, "cam-fadcontrol-eventdata", max, scale, min);
+        WriteCam(d, "cam-fadcontrol-eventdata", val, scale, min);
 
         return GetCurrentState();
@@ -2511 +2517 @@
                            "Average camera humidity exceed 60%");
 
-        newerr |= SetError(!fMagicWeatherHist[kHum].empty() && fMagicWeatherHist[kHum].back()>98 && data_taking,
-                           "Outside humidity exceeds 98% during data-taking");
+        newerr |= SetError(!fMagicWeatherHist[kHum].empty() && fMagicWeatherHist[kHum].back()>98 && fDimLidControl.state()==Lid::State::kOpen,
+                           "Outside humidity exceeds 98% while lid is open");
         newerr |= SetError(!fMagicWeatherHist[kGusts].empty() && fMagicWeatherHist[kGusts].back()>50 && (fDimDriveControl.state()==Drive::State::kTracking||fDimDriveControl.state()==Drive::State::kOnTrack),
                            "Wind gusts exceed 50km/h during tracking");
@@ -2844 +2850 @@
             }
 
-            if (fDimBiasControl.state()==BIAS::State::kVoltageOn)
-                out << " (" << fFtmPatchThresholdMed << ')';
+            if (bias_on)
+                out << " (" << setprecision(4) << fFtmPatchThresholdMed << ')';
             out << '\n';
         }
@@ -2859 +2865 @@
 
             string col = fBiasControlVoltageMed>3?HTML::kGreen:HTML::kWhite;
-            if (!fDimBiasControl.state()==BIAS::State::kVoltageOn)
+            if (bias_on)
             {
                 if (fBiasControlCurrentMed>70 || fBiasControlCurrentMax>90)
@@ -2889 +2895 @@
                 out << col << '\t';
                 out << setprecision(fBiasControlCurrentMed<100?2:3);
-                out << (bias_off ? 0 : fBiasControlCurrentMed) << '\t';
+                out << (bias_off ? 0 : (fBiasControlCurrentMed<10?fBiasControlCurrentMed:floor(fBiasControlCurrentMed))) << '\t';
                 if (bias_oc)
                     out << "(OC) ";
@@ -2897 +2903 @@
                     {
                         out << setprecision(fBiasControlCurrentMax<100?2:3);
-                        out << (bias_off ? 0 : fBiasControlCurrentMax);
+                        out << (bias_off ? 0 : (fBiasControlCurrentMax<10?fBiasControlCurrentMax:floor(fBiasControlCurrentMax)));
                     }
                     else
@@ -2903 +2909 @@
                 }
                 out << '\t';
-                out << setprecision(3);
             }
             if (cal && fDimFeedback.state()!=Feedback::State::kCalibrating)
-                out << setprecision(2) << fBiasControlPowerTot << " W" << setprecision(3);
+                out << setprecision(2) << fBiasControlPowerTot << " W";
             else
-                out << (bias_off ? 0 : fBiasControlVoltageMed) << " V";
+                out << setprecision(3) << (bias_off ? 0 : fBiasControlVoltageMed) << " V";
             out << '\n';
         }