Changeset 9485 for trunk/MagicSoft/Mars/datacenter/db/magicdefs.php
- Timestamp:
- 08/06/09 14:17:47 (15 years ago)
- File:
-
- 1 edited
-
trunk/MagicSoft/Mars/datacenter/db/magicdefs.php (modified) (16 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/datacenter/db/magicdefs.php
r9194 r9485 69 69 "fL1TriggerTableName" => CheckWhere("fL1TriggerTableKEY", $_GET), 70 70 "fL2TriggerTableName" => CheckWhere("fL2TriggerTableKEY", $_GET), 71 "fL3TriggerTableName" => CheckWhere("fL3TriggerTableKEY", $_GET), 71 72 "fHvSettingsName" => CheckWhere("fHvSettingsKEY", $_GET), 72 73 "fCalibrationScriptName" => CheckWhere("fCalibrationScriptKEY", $_GET), … … 86 87 "fBandName" => CheckWhere("fBandKEY", $_GET), 87 88 "fUserName" => CheckWhere("fUserKEY", $_GET), 89 "fCycleName" => CheckWhere("fCycleKEY", $_GET), 90 "fPIName" => CheckWhere("fPIKEY", $_GET), 91 "fWorkingGroupName" => CheckWhere("fWorkingGroupKEY", $_GET), 92 "fProposalName" => CheckWhere("fProposalKEY", $_GET), 88 93 ); 89 94 … … 96 101 "fL1TriggerTableName" => CheckGroup("fL1TriggerTableKEY", $_GET), 97 102 "fL2TriggerTableName" => CheckGroup("fL2TriggerTableKEY", $_GET), 103 "fL3TriggerTableName" => CheckGroup("fL3TriggerTableKEY", $_GET), 98 104 "fHvSettingsName" => CheckGroup("fHvSettingsKEY", $_GET), 99 105 "fCalibrationScriptName" => CheckGroup("fCalibrationScriptKEY", $_GET), … … 113 119 "fUserName" => CheckGroup("fUserKEY", $_GET), 114 120 "fTelescopeName" => CheckGroup("fTelescopeKEY", $_GET), 121 "fCycleName" => CheckWhere("fCycleKEY", $_GET), 122 "fPIName" => CheckWhere("fPIKEY", $_GET), 123 "fWorkingGroupName" => CheckWhere("fWorkingGroupKEY", $_GET), 124 "fProposalName" => CheckWhere("fProposalKEY", $_GET), 115 125 ); 116 126 … … 166 176 "fDaqStoreRate" => "Daq<br>SRate<br>[Hz]", 167 177 "fL2RatePresc" => "L2<br>pRate<br>[Hz]", 178 "fL3TriggerRate" => "L3<br>TRate<br>[Hz]", 168 179 "fL2RateUnpresc" => "L2<br>upRate<br>[Hz]", 169 180 "fManuallyChangedName" => "Manually<br>Changed", … … 182 193 "fL1TriggerTableName" => "L1Trig<br>Table", 183 194 "fL2TriggerTableName" => "L2Trig<br>Table", 195 "fL3TriggerTableName" => "L3Trig<br>Table", 184 196 "fHvSettingsName" => "HV Settings", 185 197 "fCalibrationScriptName" => "Cal Script", … … 189 201 "fDiscriminatorThresholdTableName" => "DT", 190 202 "fExcludedFDAName" => "Exclusion", 203 "fCycleName" => "Cycle", 204 "fPIName" => "PI name", 205 "fWorkingGroupName" => "Working<br>Group", 206 "fProposalName" => "Proposal", 207 "fWheelPos1" => "Wheel<br>Pos 1", 208 "fWheelPos2" => "Wheel<br>Pos 2", 191 209 "fZenithDistance" => "Zd", 192 210 "fAzimuth" => "Az", … … 373 391 $alias["fDaqStoreRate"] => "1", 374 392 $alias["fL2RatePresc"] => "1", 393 $alias["fL3TriggerRate"] => "1", 375 394 $alias["fL2RateUnpresc"] => "1", 376 395 $alias["fSequenceFirst"] => "1", … … 380 399 $alias["fZenithDistanceMin"] => "1", 381 400 $alias["fZenithDistanceMax"] => "1", 401 $alias["fWheelPos1"] => "1", 402 $alias["fWheelPos2"] => "1", 382 403 $alias["fAzimuthMin"] => "1", 383 404 $alias["fAzimuthMax"] => "1", … … 481 502 "fL1TriggerTableName" => $fromtable . ".fL1TriggerTableKEY", 482 503 "fL2TriggerTableName" => $fromtable . ".fL2TriggerTableKEY", 504 "fL3TriggerTableName" => $fromtable . ".fL3TriggerTableKEY", 483 505 "fHvSettingsName" => $fromtable . ".fHvSettingsKEY", 484 506 "fCalibrationScriptName" => $fromtable . ".fCalibrationScriptKEY", … … 498 520 "fUserName" => $fromtable . ".fUserKEY", 499 521 "fTelescopeName" => $fromtable . ".fTelescopeKEY", 522 "fCycleName" => $fromtable . ".fCycleKEY", 523 "fPIName" => $fromtable . ".fPIKEY", 524 "fWorkingGroupName" => $fromtable . ".fWorkingGroupKEY", 525 "fProposalName" => $fromtable . ".fProposalKEY", 500 526 ); 501 527 … … 532 558 "fMeanTriggerRate" => "RunData.fMeanTriggerRate", 533 559 "fL2RatePresc" => "RunData.fL2RatePresc", 560 "fL3TriggerRate" => "RunData.fL3TriggerRate", 534 561 "fL2RateUnpresc" => "RunData.fL2RateUnpresc", 535 562 "fMagicNumberName" => "MagicNumber.fMagicNumberName", … … 539 566 "fL1TriggerTableName" => "L1TriggerTable.fL1TriggerTableName", 540 567 "fL2TriggerTableName" => "L2TriggerTable.fL2TriggerTableName", 568 "fL3TriggerTableName" => "L3TriggerTable.fL3TriggerTableName", 541 569 "fHvSettingsName" => "HvSettings.fHvSettingsName", 542 570 "fManuallyChangedName" => "ManuallyChanged.fManuallyChangedName", … … 670 698 "fTelescopeName" => "Telescope.fTelescopeName", 671 699 "fUserName" => "User.fUserName", 700 "fCycleName" => "Cycle.fCycleName", 701 "fPIName" => "PI.fPIName", 702 "fWorkingGroupName" => "WorkingGroup.fWorkingGroupName", 703 "fProposalName" => "Proposal.fProposalName", 704 "fWheelPos1" => "RunData.fWheelPos1", 705 "fWheelPos2" => "RunData.fWheelPos2", 672 706 ); 673 707 … … 703 737 "fL1TriggerTableName" => " LEFT JOIN L1TriggerTable USING(fL1TriggerTableKEY) ", 704 738 "fL2TriggerTableName" => " LEFT JOIN L2TriggerTable USING(fL2TriggerTableKEY) ", 739 "fL3TriggerTableName" => " LEFT JOIN L3TriggerTable USING(fL3TriggerTableKEY) ", 705 740 "fHvSettingsName" => " LEFT JOIN HvSettings USING(fHvSettingsKEY) ", 706 741 "fCalibrationScriptName" => " LEFT JOIN CalibrationScript USING(fCalibrationScriptKEY) ", … … 720 755 "fUserName" => " LEFT JOIN User USING(fUserKEY) ", 721 756 "fTelescopeName" => " LEFT JOIN Telescope USING(fTelescopeKEY) ", 757 "fCycleName" => " LEFT JOIN Cycle USING(fCycleKEY) ", 758 "fPIName" => " LEFT JOIN PI USING(fPIKEY) ", 759 "fWorkingGroupName" => " LEFT JOIN WorkingGroup USING(fWorkingGroupKEY) ", 760 "fProposalName" => " LEFT JOIN Proposal USING(fProposalKEY) ", 722 761 ); 723 762
Note:
See TracChangeset
for help on using the changeset viewer.
