Changeset 9896 for trunk

Timestamp:

08/26/10 14:35:10 (14 years ago)

Author:

Daniela Dorner

Message:

implemented CeresSetupKEY for mcinfo.php

Location:

trunk/Mars/datacenter/db

Files:

• mcdefs.php (modified) (6 diffs)
• menu.php (modified) (2 diffs)

trunk/Mars/datacenter/db/mcdefs.php

@@ -16 +16 @@
      "fRunTypeName"                      => CheckWhere("fRunTypeKEY"),
      "fAtmosphericModelName"             => CheckWhere("fAtmosphericModelKEY"),
+     "fCeresSetupName"                   => CheckWhere("fCeresSetupKEY"),
     );
 
@@ -23 +24 @@
      "fRunTypeName"                      => CheckGroup("fRunTypeKEY"),
      "fAtmosphericModelName"             => CheckGroup("fAtmosphericModelKEY"),
+     "fCeresSetupName"                   => CheckGroup("fCeresSetupKEY"),
     );
 
@@ -46 +48 @@
      "fRunTypeName"             => "RunType",
      "fAtmosphericModelName"    => "Atm.Model",
+     "fCeresSetupName"          => "CeresSetup",
      "fCorsikaInputCreated"     => "Input",
      "Corsika"                  => "Corsika",
@@ -95 +98 @@
          "fRunTypeName"              => "RunType.fRunTypeKEY",
          "fAtmosphericModelName"     => "AtmosphericModel.fAtmosphericModelKEY",
+         "fCeresSetupName"           => "CeresSetup.fCeresSetupKEY",
         );
 
@@ -116 +120 @@
          "fRunTypeName"                      => "RunType.fRunTypeName",
          "fAtmosphericModelName"             => "AtmosphericModel.fAtmosphericModelName",
+         "fCeresSetupName"                   => "CeresSetup.fCeresSetupName",
          "fAzimuthMin"                       => "CorsikaInfo.fAzimuthMin",
          "fAzimuthMax"                       => "CorsikaInfo.fAzimuthMax",
@@ -161 +166 @@
          "fRunTypeKEY"                => " LEFT JOIN RunType              USING(fRunTypeKEY) ",
          "fAtmosphericModelKEY"       => " LEFT JOIN AtmosphericModel     USING(fAtmosphericModelKEY) ",
+         "fCeresSetupKEY"             => " LEFT JOIN CeresSetup           USING(fCeresSetupKEY) ",
          "fParticleTypeName"          => " LEFT JOIN ParticleType         USING(fParticleTypeKEY) ",
          "fRunTypeName"               => " LEFT JOIN RunType              USING(fRunTypeKEY) ",
          "fAtmosphericModelName"      => " LEFT JOIN AtmosphericModel     USING(fAtmosphericModelKEY) ",
+         "fCeresSetupName"            => " LEFT JOIN CeresSetup           USING(fCeresSetupKEY) ",
          "CorsikaStatus"              => " LEFT JOIN CorsikaStatus        USING(fRunNumber, fFileNumber) ",
          "CeresStatus"                => " LEFT JOIN CeresStatus          USING(fRunNumber, fFileNumber, fCeresSetupKEY) ",

trunk/Mars/datacenter/db/menu.php

@@ -38 +38 @@
     printf("  </td><td>\n");
     PrintPullDown($host, $user, $pw, $db, "AtmosphericModel",     "fAtmosphericModelName",     "fAtmosphericModelKEY", "Atm. model");
+    printf("  </td><td>\n");
+    PrintPullDown($host, $user, $pw, $db, "CeresSetup",     "fCeresSetupName",     "fCeresSetupKEY", "Ceres setup");
     printf("  </td>\n");
 
@@ -1672 +1674 @@
         $_GET["fAtmosphericModelName"]="Off";
 
+    if (empty($_GET["fCeresSetupName"]))
+        $_GET["fCeresSetupName"]=$first?"On":"";
+
     if (empty($_GET["fNumEvents"]))
         $_GET["fNumEvents"]=$first?"On":"";