Index: trunk/MagicSoft/Mars/datacenter/db/menu.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/menu.php	(revision 9546)
+++ trunk/MagicSoft/Mars/datacenter/db/menu.php	(revision 9599)
@@ -17,9 +17,5 @@
     CheckBox("fImpactMax",        "Impact");
     CheckBox("fViewConeMax",      "Viewcone");
-    CheckBox("fNumReUseShower",   "#Shower reuse");
     CheckBox("fStartingAltitude", "Starting alt.");
-
-    printf("  </tr><tr>\n");
-
     CheckBox("fMirrorDiameter", "Mirror diam.");
 
@@ -35,4 +31,6 @@
     PrintPullDown($host, $user, $pw, $db, "ParticleType",     "fParticleTypeName",     "fParticleTypeKEY", "Particle type");
     printf("  </td><td>\n");
+    PrintPullDown($host, $user, $pw, $db, "RunType",     "fRunTypeName",     "fRunTypeKEY", "Run type");
+    printf("  </td><td>\n");
     PrintPullDown($host, $user, $pw, $db, "AtmosphericModel",     "fAtmosphericModelName",     "fAtmosphericModelKEY", "Atm. model");
     printf("  </td>\n");
@@ -49,7 +47,15 @@
     printf("  <tr><td>\n");
 
-    PrintStatusMenu("fCorsikaInputCreated",    "Input");
-    printf("  </td><td>\n");
-    PrintStatusMenu("fCorsikaFileAvail",    "Corsika");
+    PrintStatusMenu("Corsika",    "Corsika");
+    printf("  </td><td>\n");
+    PrintStatusMenu("Ceres",    "Ceres");
+    printf("  </td><td>\n");
+    PrintStatusMenu("SequenceFile",    "SequenceFile");
+
+    printf("  </td></tr><tr><td>\n");
+
+    PrintStatusMenu("Callisto",    "Callisto");
+    printf("  </td><td>\n");
+    PrintStatusMenu("Star",    "Star");
 
     printf(" </td></tr></table>\n");
@@ -627,10 +633,10 @@
 {
     if (empty($_GET["fRunMin"]))
-        $min = GetMin("fCorsikaRunNumber", "MCCorsikaRunData", $host, $user, $pw, $db);
+        $min = GetMin("fRunNumber", "CorsikaInfo", $host, $user, $pw, $db);
     else
         $min = $_GET["fRunMin"];
 
     if (empty($_GET["fRunMax"]))
-        $max = GetMax("fCorsikaRunNumber", "MCCorsikaRunData", $host, $user, $pw, $db);
+        $max = GetMax("fRunNumber", "CorsikaInfo", $host, $user, $pw, $db);
     else
         $max = $_GET["fRunMax"];
@@ -1625,15 +1631,34 @@
 function InitMCRunStatus($_GET, $first)
 {
-    if (empty($_GET["fCorsikaFileAvail"]))
-        $_GET["fCorsikaFileAvail"]="On";
-
-    if (empty($_GET["fCorsikaFileAvailStatus"]))
-        $_GET["fCorsikaFileAvailStatus"]="0";
-
-    if (empty($_GET["fCorsikaInputCreated"]))
-        $_GET["fCorsikaInputCreated"]="Off";
-
-    if (empty($_GET["fCorsikaInputCreatedStatus"]))
-        $_GET["fCorsikaInputCreatedStatus"]="0";
+
+    if (empty($_GET["Corsika"]))
+        $_GET["Corsika"]=$first?"On":"";
+
+    if (empty($_GET["CorsikaStatus"]))
+        $_GET["CorsikaStatus"]="0";
+
+    if (empty($_GET["Ceres"]))
+        $_GET["Ceres"]=$first?"On":"";
+
+    if (empty($_GET["CeresStatus"]))
+        $_GET["CeresStatus"]="0";
+
+    if (empty($_GET["SequenceFile"]))
+        $_GET["SequenceFile"]=$first?"Off":"";
+
+    if (empty($_GET["SequenceFileStatus"]))
+        $_GET["SequenceFileStatus"]="0";
+
+    if (empty($_GET["Callisto"]))
+        $_GET["Callisto"]=$first?"Off":"";
+
+    if (empty($_GET["CallistoStatus"]))
+        $_GET["CallistoStatus"]="0";
+
+    if (empty($_GET["Star"]))
+        $_GET["Star"]=$first?"On":"";
+
+    if (empty($_GET["StarStatus"]))
+        $_GET["StarStatus"]="0";
 
 }
@@ -1649,5 +1674,8 @@
 
     if (empty($_GET["fParticleTypeName"]))
-        $_GET["fParticleTypeName"]="On";
+        $_GET["fParticleTypeName"]=$first?"On":"";
+
+    if (empty($_GET["fRunTypeName"]))
+        $_GET["fRunTypeName"]=$first?"On":"";
 
     if (empty($_GET["fAtmosphericModelName"]))
@@ -1658,38 +1686,35 @@
 
     if (empty($_GET["fZenithDistanceMin"]))
-        $_GET["fZenithDistanceMin"]="On";
+        $_GET["fZenithDistanceMin"]=$first?"On":"";
 
     if (empty($_GET["fZenithDistanceMax"]))
-        $_GET["fZenithDistanceMax"]="On";
+        $_GET["fZenithDistanceMax"]=$first?"On":"";
 
     if (empty($_GET["fAzimuthMin"]))
-        $_GET["fAzimuthMin"]="On";
+        $_GET["fAzimuthMin"]=$first?"On":"";
 
     if (empty($_GET["fAzimuthMax"]))
-        $_GET["fAzimuthMax"]="On";
+        $_GET["fAzimuthMax"]=$first?"On":"";
 
     if (empty($_GET["fEnergyMin"]))
-        $_GET["fEnergyMin"]="On";
+        $_GET["fEnergyMin"]=$first?"On":"";
 
     if (empty($_GET["fEnergyMax"]))
-        $_GET["fEnergyMax"]="On";
+        $_GET["fEnergyMax"]=$first?"On":"";
 
     if (empty($_GET["fImpactMax"]))
-        $_GET["fImpactMax"]="On";
+        $_GET["fImpactMax"]=$first?"On":"";
 
     if (empty($_GET["fViewConeMax"]))
-        $_GET["fViewConeMax"]="On";
+        $_GET["fViewConeMax"]=$first?"On":"";
 
     if (empty($_GET["fEnergySlope"]))
-        $_GET["fEnergySlope"]="On";
-
-    if (empty($_GET["fNumReUseShower"]))
-        $_GET["fNumReUseShower"]="Off";
+        $_GET["fEnergySlope"]=$first?"On":"";
 
     if (empty($_GET["fStartingAltitude"]))
-        $_GET["fStartingAltitude"]="On";
+        $_GET["fStartingAltitude"]=$first?"On":"";
 
     if (empty($_GET["fMirrorDiameter"]))
-        $_GET["fMirrorDiameter"]="On";
+        $_GET["fMirrorDiameter"]=$first?"On":"";
 
 }