Changeset 18414

Timestamp:

01/21/16 17:23:58 (9 years ago)

Author:

tbretz

Message:

Exclude crazy patched from current statistics; updated some limits for the disk space, updated limits for camera humidity and currents.

File:

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

trunk/FACT++/src/smartfact.cc

@@ -1194 +1194 @@
             for (int i=0; i<320; i++)
             {
+                // Exclude crazy pixels
+                if (i==66 || i==191 || i==193)
+                    continue;
+
                 // Group index (0 or 1) of the of the pixel (4 or 5 pixel patch)
                 const int N = fPixelMap.hv(i).count();
@@ -1222 +1226 @@
 
         // Divide by number of summed channels, convert to mW
-        power_apd /= 320e-3; // [mW]
+        power_apd /= (320-3)*1e-3; // [mW]
 
         if (power_tot<1e-3)
@@ -1246 +1250 @@
         // --------------------------------------------------------
 
-        const Statistics stat(vector<float>(ptr, ptr+320));
+        // After being displayed, exclude the patches with
+        // the crazy pixels from the statsitics
+
+        vector<float> cpy(ptr, ptr+320);
+        cpy[66]  = 0;
+        cpy[191] = 0;
+        cpy[193] = 0;
+        const Statistics stat(cpy);
 
         // Exclude the three crazy channels
@@ -2621 +2632 @@
             const uint32_t cnt = res[0][0];
 
-            reqscript = cnt>0 && fSun.state>=2 && fSun.state<=6;
+            reqscript = cnt>0 && (fSun.state==3 || fSun.state==4);
         }
         catch (const exception &e)
@@ -2684 +2695 @@
                            "BIAS voltage not at reference");
 
-
-        newerr |= SetError(bias_on && calibrated && fBiasControlCurrentMed>90,
-                           "Median current exceeds 90&micro;A/pix");
-        newerr |= SetError(bias_on && calibrated && fBiasControlCurrentMax>110,
-                           "Maximum current exceeds 110&micro;A/pix");
+        newerr |= SetError(fDimFeedback.state()==Feedback::State::kOnStandby,
+                           "Feedback in standby due to high currents");
+
+
+        newerr |= SetError(bias_on && calibrated && fBiasControlCurrentMed>115,
+                           "Median current (excl. crazy) exceeds 115&micro;A/pix");
+        newerr |= SetError(bias_on && calibrated && fBiasControlCurrentMax>160,
+                           "Maximum current (excl. crazy) exceeds 160&micro;A/pix");
 
         newerr |= SetError(fFscControlHumidityAvg>60,
                            "Average camera humidity exceed 60%");
 
-        newerr |= SetError(!fPfMiniHumidityHist.empty() && fPfMiniHumidityHist.back()>40,
-                           "Camera humidity inside camera exceeds 40% (PFmini)");
+        newerr |= SetError(!fPfMiniHumidityHist.empty() && fPfMiniHumidityHist.back()>50,
+                           "Camera humidity inside camera exceeds 50% (PFmini)");
         newerr |= SetError(!fTemperatureControlHist.empty() && (fTemperatureControlHist.back()<26.5 || fTemperatureControlHist.back()>29),
                            "Container temperature outside [26.5;29]&deg;C");
@@ -2725 +2739 @@
                            "Last run finshed, but contained zero events.");
 
-        newerr |= SetError(fFreeSpace<50000000000,
+        newerr |= SetError(fFreeSpace<uint64_t(50000000000),
                            "Less than 50GB disk space left on newdaq.");
 
-        newerr |= SetError(freedaq<80000000000,
-                           "Less than 80GB disk space left on daq.");
+        newerr |= SetError(freedaq<uint64_t(800000000000),
+                           "Less than 800GB disk space left on daq.");
 
         newerr |= SetError(fDimPwrControl.state()==Power::State::kCoolingFailure,
@@ -3055 +3069 @@
             if (bias_on)
             {
-                if (fBiasControlCurrentMed>70 || fBiasControlCurrentMax>90)
+                if (fBiasControlCurrentMed>95 || fBiasControlCurrentMax>135)
                     col = HTML::kYellow;
-                if (fBiasControlCurrentMed>90 || fBiasControlCurrentMax>110)
+                if (fBiasControlCurrentMed>100 || fBiasControlCurrentMax>140)
                     col = HTML::kRed;
             }
@@ -3161 +3175 @@
 
             col = HTML::kRed;
-            if (freedaq>uint64_t(199999999999))
+            if (freedaq>uint64_t(999999999999))
                 col = HTML::kYellow;
-            if (freedaq>uint64_t(999999999999))
+            if (freedaq>uint64_t(149999999999))
                 col = HTML::kGreen;
             if (freedaq==UINT64_MAX)