Index: trunk/MagicSoft/Mars/datacenter/db/magicdefs.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/magicdefs.php	(revision 9194)
+++ trunk/MagicSoft/Mars/datacenter/db/magicdefs.php	(revision 9485)
@@ -69,4 +69,5 @@
      "fL1TriggerTableName"               => CheckWhere("fL1TriggerTableKEY",               $_GET),
      "fL2TriggerTableName"               => CheckWhere("fL2TriggerTableKEY",               $_GET),
+     "fL3TriggerTableName"               => CheckWhere("fL3TriggerTableKEY",               $_GET),
      "fHvSettingsName"                   => CheckWhere("fHvSettingsKEY",                   $_GET),
      "fCalibrationScriptName"            => CheckWhere("fCalibrationScriptKEY",            $_GET),
@@ -86,4 +87,8 @@
      "fBandName"                         => CheckWhere("fBandKEY",                         $_GET),
      "fUserName"                         => CheckWhere("fUserKEY",                         $_GET),
+     "fCycleName"                        => CheckWhere("fCycleKEY",                        $_GET),
+     "fPIName"                           => CheckWhere("fPIKEY",                           $_GET),
+     "fWorkingGroupName"                 => CheckWhere("fWorkingGroupKEY",                 $_GET),
+     "fProposalName"                     => CheckWhere("fProposalKEY",                     $_GET),
     );
 
@@ -96,4 +101,5 @@
      "fL1TriggerTableName"               => CheckGroup("fL1TriggerTableKEY",               $_GET),
      "fL2TriggerTableName"               => CheckGroup("fL2TriggerTableKEY",               $_GET),
+     "fL3TriggerTableName"               => CheckGroup("fL3TriggerTableKEY",               $_GET),
      "fHvSettingsName"                   => CheckGroup("fHvSettingsKEY",                   $_GET),
      "fCalibrationScriptName"            => CheckGroup("fCalibrationScriptKEY",            $_GET),
@@ -113,4 +119,8 @@
      "fUserName"                         => CheckGroup("fUserKEY",                         $_GET),
      "fTelescopeName"                    => CheckGroup("fTelescopeKEY",                    $_GET),
+     "fCycleName"                        => CheckWhere("fCycleKEY",                        $_GET),
+     "fPIName"                           => CheckWhere("fPIKEY",                           $_GET),
+     "fWorkingGroupName"                 => CheckWhere("fWorkingGroupKEY",                 $_GET),
+     "fProposalName"                     => CheckWhere("fProposalKEY",                     $_GET),
     );
 
@@ -166,4 +176,5 @@
      "fDaqStoreRate"                    => "Daq<br>SRate<br>[Hz]",
      "fL2RatePresc"                     => "L2<br>pRate<br>[Hz]",
+     "fL3TriggerRate"                   => "L3<br>TRate<br>[Hz]",
      "fL2RateUnpresc"                   => "L2<br>upRate<br>[Hz]",
      "fManuallyChangedName"             => "Manually<br>Changed",
@@ -182,4 +193,5 @@
      "fL1TriggerTableName"              => "L1Trig<br>Table",
      "fL2TriggerTableName"              => "L2Trig<br>Table",
+     "fL3TriggerTableName"              => "L3Trig<br>Table",
      "fHvSettingsName"                  => "HV Settings",
      "fCalibrationScriptName"           => "Cal Script",
@@ -189,4 +201,10 @@
      "fDiscriminatorThresholdTableName" => "DT",
      "fExcludedFDAName"                 => "Exclusion",
+     "fCycleName"                       => "Cycle",
+     "fPIName"                          => "PI name",
+     "fWorkingGroupName"                => "Working<br>Group",
+     "fProposalName"                    => "Proposal",
+     "fWheelPos1"                       => "Wheel<br>Pos 1",
+     "fWheelPos2"                       => "Wheel<br>Pos 2",
      "fZenithDistance"                  => "Zd",
      "fAzimuth"                         => "Az",
@@ -373,4 +391,5 @@
      $alias["fDaqStoreRate"]             => "1",
      $alias["fL2RatePresc"]              => "1",
+     $alias["fL3TriggerRate"]            => "1",
      $alias["fL2RateUnpresc"]            => "1",
      $alias["fSequenceFirst"]            => "1",
@@ -380,4 +399,6 @@
      $alias["fZenithDistanceMin"]        => "1",
      $alias["fZenithDistanceMax"]        => "1",
+     $alias["fWheelPos1"]                => "1",
+     $alias["fWheelPos2"]                => "1",
      $alias["fAzimuthMin"]               => "1",
      $alias["fAzimuthMax"]               => "1",
@@ -481,4 +502,5 @@
          "fL1TriggerTableName"               => $fromtable . ".fL1TriggerTableKEY",
          "fL2TriggerTableName"               => $fromtable . ".fL2TriggerTableKEY",
+         "fL3TriggerTableName"               => $fromtable . ".fL3TriggerTableKEY",
          "fHvSettingsName"                   => $fromtable . ".fHvSettingsKEY",
          "fCalibrationScriptName"            => $fromtable . ".fCalibrationScriptKEY",
@@ -498,4 +520,8 @@
          "fUserName"                         => $fromtable . ".fUserKEY",
          "fTelescopeName"                    => $fromtable . ".fTelescopeKEY",
+         "fCycleName"                        => $fromtable . ".fCycleKEY",
+         "fPIName"                           => $fromtable . ".fPIKEY",
+         "fWorkingGroupName"                 => $fromtable . ".fWorkingGroupKEY",
+         "fProposalName"                     => $fromtable . ".fProposalKEY",
         );
 
@@ -532,4 +558,5 @@
          "fMeanTriggerRate"                  => "RunData.fMeanTriggerRate",
          "fL2RatePresc"                      => "RunData.fL2RatePresc",
+         "fL3TriggerRate"                    => "RunData.fL3TriggerRate",
          "fL2RateUnpresc"                    => "RunData.fL2RateUnpresc",
          "fMagicNumberName"                  => "MagicNumber.fMagicNumberName",
@@ -539,4 +566,5 @@
          "fL1TriggerTableName"               => "L1TriggerTable.fL1TriggerTableName",
          "fL2TriggerTableName"               => "L2TriggerTable.fL2TriggerTableName",
+         "fL3TriggerTableName"               => "L3TriggerTable.fL3TriggerTableName",
          "fHvSettingsName"                   => "HvSettings.fHvSettingsName",
          "fManuallyChangedName"              => "ManuallyChanged.fManuallyChangedName",
@@ -670,4 +698,10 @@
          "fTelescopeName"                    => "Telescope.fTelescopeName",
          "fUserName"                         => "User.fUserName",
+         "fCycleName"                        => "Cycle.fCycleName",
+         "fPIName"                           => "PI.fPIName",
+         "fWorkingGroupName"                 => "WorkingGroup.fWorkingGroupName",
+         "fProposalName"                     => "Proposal.fProposalName",
+         "fWheelPos1"                        => "RunData.fWheelPos1",
+         "fWheelPos2"                        => "RunData.fWheelPos2",
         );
 
@@ -703,4 +737,5 @@
          "fL1TriggerTableName"              => " LEFT JOIN L1TriggerTable              USING(fL1TriggerTableKEY) ",
          "fL2TriggerTableName"              => " LEFT JOIN L2TriggerTable              USING(fL2TriggerTableKEY) ",
+         "fL3TriggerTableName"              => " LEFT JOIN L3TriggerTable              USING(fL3TriggerTableKEY) ",
          "fHvSettingsName"                  => " LEFT JOIN HvSettings                  USING(fHvSettingsKEY) ",
          "fCalibrationScriptName"           => " LEFT JOIN CalibrationScript           USING(fCalibrationScriptKEY) ",
@@ -720,4 +755,8 @@
          "fUserName"                        => " LEFT JOIN User                        USING(fUserKEY) ",
          "fTelescopeName"                   => " LEFT JOIN Telescope                   USING(fTelescopeKEY) ",
+         "fCycleName"                       => " LEFT JOIN Cycle                       USING(fCycleKEY) ",
+         "fPIName"                          => " LEFT JOIN PI                          USING(fPIKEY) ",
+         "fWorkingGroupName"                => " LEFT JOIN WorkingGroup                USING(fWorkingGroupKEY) ",
+         "fProposalName"                    => " LEFT JOIN Proposal                    USING(fProposalKEY) ",
         );