Changeset 8997 for trunk

Timestamp:

07/08/08 11:47:51 (16 years ago)

Author:

hoehne

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/magicdefs.php (modified) (6 diffs)
• datacenter/db/menu.php (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/07/08 Daniel Hoehne
+
+   * datacenter/db/menu.php, datacenter/db/magicdefs.php:
+     - added new columns (fRateTrigEvts, fRateSumEvts, fRatePedEvts,
+       fRatePedTrigEvts, fRateCalEvts, fRateNullEvts, fRateUnknownEvts,
+       fRatioCalEvents, fPulsePosCalib, fAvgWindSpeed, fAvgTemperature,
+       fAvgHumidity, fAvgTempSky, fAvgCloudiness, fRmsCloudiness)
+
+
 
  2008/07/05 Thomas Bretz

trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

@@ -222 +222 @@
      "fUnsuitableMax"                   => "Un<br>suit.<br>Max",
      "fDeadMax"                         => "Dead<br>Max",
+     "fRateTrigEvts"                    => "Rate Trig.<br>Evts [Hz]",
+     "fRateSumEvts"                     => "Rate Sum<br>Evts [Hz]",
+     "fRatePedEvts"                     => "Rate Ped<br>Evts [Hz]",
+     "fRatePedTrigEvts"                 => "Rate Ped.Trig.<br>Evts [Hz]",
+     "fRateCalEvts"                     => "Rate Cal.<br>Evts [Hz]",
+     "fRateNullEvts"                    => "Rate Null<br>Evts [Hz]",
+     "fRateUnknownEvts"                 => "Rate Unknown<br>Evts [Hz]",
+     "fRatioCalEvents"                  => "Ratio Cal.<br>Events",
+     "fPulsePosCalib"                   => "Pulse Pos.<br>Calib",
      "fIsolatedOuter"                   => "Isol.<br>Out",
      "fIsolatedInner"                   => "Isol.<br>In",
@@ -257 +266 @@
      "fNumStarsCorMed"                  => "#<br>cor.<br>stars",
      "fNumStarsCorRMS"                  => "RMS<br>cor.<br>stars",
+     "fAvgWindSpeed"                    => "Avg. wind<br>speed [m/s]",
+     "fAvgTemperature"                  => "Avg. temp.<br>[deg]",
+     "fAvgHumidity"                     => "Avg. hum.<br>[%]",
+     "fAvgTempSky"                      => "Avg. sky<br>temp [deg]",
+     "fAvgCloudiness"                   => "Avg. cloud.<br>[%]",
+     "fRmsCloudiness"                   => "RMS cloud.<br>[%]",
      "fEvents"                          => "DataEvents",
      "fPositionSignal"                  => "ArrTime",
@@ -371 +386 @@
      $alias["fUnsuitableMax"]            => "1",
      $alias["fDeadMax"]                  => "1",
+     $alias["fRateTrigEvts"]             => "1",
+     $alias["fRateSumEvts"]              => "1",
+     $alias["fRatePedEvts"]              => "1",
+     $alias["fRatePedTrigEvts"]          => "1",
+     $alias["fRateCalEvts"]              => "1",
+     $alias["fRateNullEvts"]             => "1",
+     $alias["fRateUnknownEvts"]          => "1",
+     $alias["fRatioCalEvents"]           => "1",
+     $alias["fPulsePosCalib"]            => "1",
      $alias["fIsolatedOuter"]            => "1",
      $alias["fIsolatedInner"]            => "1",
@@ -403 +427 @@
      $alias["fNumStarsCorMed"]           => "1",
      $alias["fNumStarsCorRMS"]           => "1",
+     $alias["fAvgWindSpeed"]             => "1",
+     $alias["fAvgTemperature"]           => "1",
+     $alias["fAvgHumidity"]              => "1",
+     $alias["fAvgTempSky"]               => "1",
+     $alias["fAvgCloudiness"]            => "1",
+     $alias["fRmsCloudiness"]            => "1",
      $alias["fDate"]                     => "1",
      $alias["fCaCoFileFound"]            => "1",
@@ -531 +561 @@
          "fUnsuitableMax"                    => "Calibration.fUnsuitableMax",
          "fDeadMax"                          => "Calibration.fDeadMax",
+         "fRateTrigEvts"                     => "Calibration.fRateTrigEvts",
+         "fRateSumEvts"                      => "Calibration.fRateSumEvts",
+         "fRatePedEvts"                      => "Calibration.fRatePedEvts",
+         "fRatePedTrigEvts"                  => "Calibration.fRatePedTrigEvts",
+         "fRateCalEvts"                      => "Calibration.fRateCalEvts",
+         "fRateNullEvts"                     => "Calibration.fRateNullEvts",
+         "fRateUnknownEvts"                  => "Calibration.fRateUnknownEvts",
+         "fRatioCalEvents"                   => "Calibration.fRatioCalEvents",
+         "fPulsePosCalib"                    => "Calibration.fPulsePosCalib",
          "fUnreliableInner"                  => "Calibration.fUnreliableInner",
          "fUnreliableOuter"                  => "Calibration.fUnreliableOuter",
@@ -567 +606 @@
          "fNumStarsCorMed"                   => "Star.fNumStarsCorMed",
          "fNumStarsCorRMS"                   => "Star.fNumStarsCorRMS",
+         "fAvgWindSpeed"                     => "Star.fAvgWindSpeed",
+         "fAvgTemperature"                   => "Star.fAvgTemperature",
+         "fAvgHumidity"                      => "Star.fAvgHumidity",
+         "fAvgTempSky"                       => "Star.fAvgTempSky",
+         "fAvgCloudiness"                    => "Star.fAvgCloudiness",
+         "fRmsCloudiness"                    => "Star.fRmsCloudiness",
          "fDataSetNumber"                    => $fromtable . ".fDataSetNumber",
          "fDataSetInserted"                  => "DataSetProcessStatus.fDataSetInserted",

trunk/MagicSoft/Mars/datacenter/db/menu.php

@@ -314 +314 @@
     CheckBox("fConvFactorOuter",     "Conv outer ");
     CheckBox("fPulsePosMean",        "Mean PulsePos");
+    CheckBox("fPulsePosCalib",       "Cal PulsePos");
+
+    printf("  </tr><tr>\n");
+
+    CheckBox("fRateTrigEvts",        "Rate Trig evts");
+    CheckBox("fRateSumEvts",         "Rate Sum Trig evts");
+    CheckBox("fRatePedEvts",         "Rate Ped evts");
+    CheckBox("fRatePedTrigEvts",     "Rate Ped Trig evts");
+
+    printf("  </tr><tr>\n");
+
+    CheckBox("fRateCalEvts",         "Rate Cal evts");
+    CheckBox("fRateNullEvts",        "Rate Null evts");
+    CheckBox("fRateUnknownEvts",     "Rate Unknown evts");
+    CheckBox("fRatioCalEvents",      "Ratio Cal evts");
 
     printf(" </tr></table>\n");
@@ -354 +369 @@
     CheckBox("fNumStarsCorMed",     "# cor. Stars");
     CheckBox("fNumStarsCorRMS",     "RMS cor. Stars");
+
+    printf("  </tr><tr>\n");
+
+    CheckBox("fAvgWindSpeed",       "Avg wind speed");
+    CheckBox("fAvgTemperature",     "Avg temperature");
+    CheckBox("fAvgHumidity",        "Avg humidity");
+    CheckBox("fAvgTempSky",         "Avg sky temperature");
+
+    printf("  </tr><tr>\n");
+
+    CheckBox("fAvgCloudiness",      "Avg cloudiness");
+    CheckBox("fRmsCloudiness",      "RMS cloudiness");
 
     printf("  </tr>\n");
@@ -827 +854 @@
     if (empty($_GET["fNumStarsCorRMS"]))
         $_GET["fNumStarsCorRMS"]="Off";
+
+    if (empty($_GET["fAvgWindSpeed"]))
+        $_GET["fAvgWindSpeed"]="Off";
+
+    if (empty($_GET["fAvgTemperature"]))
+        $_GET["fAvgTemperature"]="Off";
+
+    if (empty($_GET["fAvgHumidity"]))
+        $_GET["fAvgHumidity"]="Off";
+
+    if (empty($_GET["fAvgTempSky"]))
+        $_GET["fAvgTempSky"]="Off";
+
+    if (empty($_GET["fAvgCloudiness"]))
+        $_GET["fAvgCloudiness"]="Off";
+
+    if (empty($_GET["fRmsCloudiness"]))
+        $_GET["fRmsCloudiness"]="Off";
 }
 
@@ -854 +899 @@
     if (empty($_GET["fDeadMax"]))
         $_GET["fDeadMax"]="Off";
+
+    if (empty($_GET["fRateTrigEvts"]))
+        $_GET["fRateTrigEvts"]="Off";
+
+    if (empty($_GET["fRateSumEvts"]))
+        $_GET["fRateSumEvts"]="Off";
+
+    if (empty($_GET["fRatePedEvts"]))
+        $_GET["fRatePedEvts"]="Off";
+
+    if (empty($_GET["fRatePedTrigEvts"]))
+        $_GET["fRatePedTrigEvts"]="Off";
+
+    if (empty($_GET["fRateCalEvts"]))
+        $_GET["fRateCalEvts"]="Off";
+
+    if (empty($_GET["fRateNullEvts"]))
+        $_GET["fRateNullEvts"]="Off";
+
+    if (empty($_GET["fRateUnknownEvts"]))
+        $_GET["fRateUnknownEvts"]="Off";
+
+    if (empty($_GET["fRatioCalEvents"]))
+        $_GET["fRatioCalEvents"]="Off";
+
+    if (empty($_GET["fPulsePosCalib"]))
+        $_GET["fPulsePosCalib"]="Off";
 
     if (empty($_GET["fIsolatedInner"]))