Index: trunk/MagicSoft/Mars/datacenter/db/magicdefs.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/magicdefs.php	(revision 7547)
+++ trunk/MagicSoft/Mars/datacenter/db/magicdefs.php	(revision 7873)
@@ -25,26 +25,35 @@
 
 
-$limits = array
+$limitsmean = array
     (
      "fPedRmsInLimit"    => "fMeanPedRmsInner",
-     "fArrTimeLimit"     => "fArrTimeRmsInner",
+//     "fArrTRmsLimit"     => "fArrTimeRmsInner",
      "fMuonRateLimit"    => "fMuonRate",
+     "fMuonCalLimit"     => "fRatio",
      "fPSFLimit"         => "fPSF",
+     "fInhomLimit"       => "fInhomogeneity",
+     "fNumIslLimit"      => "fMeanNumberIslands",
      "fImgRateLimit"     => "fDataRate",
+     "fSkyBrightLimit"   => "fBrightnessMed",
+    );
+
+$limitsmin = array
+    (
+     "fZdMinLimit"       => "fZenithDistanceMin",
+     "fNumStarsLimit"    => "fNumStarsMed",
+     "fNumStarsCorLimit" => "fNumStarsCorMed",
+     "fMuonNumLimit"     => "fMuonNumber",
+     "fArrTimeLimit"     => "fArrTimeInner",
+     "fPulsePosLimit"    => "fMeanPulsePosInner",
+    );
+
+$limitsmax = array
+    (
+     "fZdMaxLimit"       => "fZenithDistanceMax",
      "fUnsInLimit"       => "fUnsuitableInner",
-     "fZdMinLimit"       => "fZenithDistanceMin",
-     "fZdMaxLimit"       => "fZenithDistanceMax",
-    );
-
-$rms = array
-    (
-     "fPedRmsInLimit"    => "yes",
-     "fArrTimeLimit"     => "yes",
-     "fMuonRateLimit"    => "yes",
-     "fUnsInLimit"       => "max",
-     "fPSFLimit"         => "yes",
-     "fImgRateLimit"     => "yes",
-     "fZdMinLimit"       => "min",
-     "fZdMaxLimit"       => "max",
+     "fIsoInLimit"       => "fIsolatedInner",
+     "fIMCLimit"         => "fIsolatedMaxCluster",
+     "fMaxHumLimit"      => "fMaxHumidity",
+     "fRelTimeLimit"     => "fEffOnTime/fRunTime",
     );
 
@@ -216,4 +225,10 @@
      "fDataRate"                        => "Img.<br>Rate<br>[Hz]",
      "fMaxHumidity"                     => "Max<br>Hum<br>[%]",
+     "fBrightnessMed"                   => "Sky<br>Brightness<br>Med",
+     "fBrightnessRMS"                   => "Sky<br>Brightness<br>RMS",
+     "fNumStarsMed"                     => "#<br>id.<br>stars",
+     "fNumStarsRMS"                     => "RMS<br>id.<br>stars",
+     "fNumStarsCorMed"                  => "#<br>cor.<br>stars",
+     "fNumStarsCorRMS"                  => "RMS<br>cor.<br>stars",
      "fEvents"                          => "DataEvents",
      "fPositionSignal"                  => "ArrTime",
@@ -253,12 +268,25 @@
      "Max(fZenithDistance)"             => "ZdMax",
      "COUNT(*)"                         => "Sequence",
-     "fArrTimeLimit"                    => "ArrTRms",
+//     "fArrTimeLimit"                    => "ArrTRms",
+     "fArrTimeLimit"                    => "ArrTime",
+     "fPulsePosLimit"                   => "PulsePos",
      "fPedRmsInLimit"                   => "PedRms",
      "fMuonRateLimit"                   => "MuonRate",
+     "fMuonNumLimit"                    => "# Muons",
+     "fMuonCalLimit"                    => "MuonCal",
      "fPSFLimit"                        => "PSF",
+     "fInhomLimit"                      => "Inhom.",
+     "fNumIslLimit"                     => "# Islands",
      "fImgRateLimit"                    => "ImgRate",
+     "fSkyBrightLimit"                  => "SkyBrightness",
+     "fNumStarsLimit"                   => "# id. Stars",
+     "fNumStarsCorLimit"                => "# cor. Stars",
      "fUnsInLimit"                      => "Unsuit.In",
+     "fIsoInLimit"                      => "Isol.In",
+     "fIMCLimit"                        => "IMC",
+     "fMaxHumLimit"                     => "Humidity",
      "fZdMinLimit"                      => "ZdMin",
      "fZdMaxLimit"                      => "ZdMax",
+     "fRelTimeLimit"                    => "Rel.Ontime",
      "fEMin"                            => "Emin",
      "fEMax"                            => "Emax",
@@ -321,4 +349,10 @@
      $alias["fDataRate"]                 => "1",
      $alias["fMaxHumidity"]              => "1",
+     $alias["fBrightnessMed"]            => "1",
+     $alias["fBrightnessRMS"]            => "1",
+     $alias["fNumStarsMed"]              => "1",
+     $alias["fNumStarsRMS"]              => "1",
+     $alias["fNumStarsCorMed"]           => "1",
+     $alias["fNumStarsCorRMS"]           => "1",
      $alias["fDate"]                     => "1",
      $alias["fCaCoFileFound"]            => "1",
@@ -466,4 +500,10 @@
          "fDataRate"                         => "Star.fDataRate",
          "fMaxHumidity"                      => "Star.fMaxHumidity",
+         "fBrightnessMed"                    => "Star.fBrightnessMed",
+         "fBrightnessRMS"                    => "Star.fBrightnessRMS",
+         "fNumStarsMed"                      => "Star.fNumStarsMed",
+         "fNumStarsRMS"                      => "Star.fNumStarsRMS",
+         "fNumStarsCorMed"                   => "Star.fNumStarsCorMed",
+         "fNumStarsCorRMS"                   => "Star.fNumStarsCorRMS",
          "fDataSetNumber"                    => $fromtable . ".fDataSetNumber",
          "fDataSetInserted"                  => "DataSetProcessStatus.fDataSetInserted",
@@ -506,5 +546,5 @@
          "Min(fZenithDistance)"              => "'ZdMin'",
          "Max(fZenithDistance)"              => "'ZdMax'",
-//         "COUNT(*)"                          => "'Sequ'",
+         "COUNT(*)"                          => "'Sequence'",
          "fStartTime"                        => "fStartTime",
          "fFailedTime"                       => "fFailedTime",