Changeset 9485
- Timestamp:
- 08/06/09 14:17:47 (15 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
-
Changelog (modified) (1 diff)
-
datacenter/db/magicdefs.php (modified) (16 diffs)
-
datacenter/db/menu.php (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r9484 r9485 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2009/08/03 Daniel Hoehne-Moench, Stefan Ruegamer 22 23 * datacenter/db/menu.php, magicdefs.php: 24 - added new columns L3TriggerTable, WheelPos1, WheelPos2 as well as 25 the KEY tables Cycle, PI, WorkingGroup and Proposal 26 27 20 28 21 29 2009/08/03 Daniela Dorner -
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 -
trunk/MagicSoft/Mars/datacenter/db/menu.php
r9483 r9485 65 65 // CheckBox("fFormatVersion", "File format"); 66 66 CheckBox("fNumEvents", "Num of events"); 67 CheckBox("fMeanTriggerRate", "Mean Trigger rate"); 67 CheckBox("fMeanTriggerRate", "Mean Trigger Rate"); 68 CheckBox("fL3TriggerRate", "L3 Trigger Rate"); 68 69 CheckBox("fSequenceFirst", "Sequence Number"); 69 70 … … 72 73 CheckBox("fTest", "incl. TestSources"); 73 74 CheckBox("fLinks", "Links"); 75 CheckBox("fWheelPos1", "Wheel Position 1"); 76 CheckBox("fWheelPos2", "Wheel Position 2"); 74 77 75 78 printf(" </tr>\n"); … … 130 133 PrintPullDown($host, $user, $pw, $db, "CalibrationScript", "fCalibrationScriptName", "fCalibrationScriptKEY", "Cal Script"); 131 134 printf(" </td><td>\n"); 135 PrintPullDown($host, $user, $pw, $db, "L3TriggerTable", "fL3TriggerTableName", "fL3TriggerTableKEY", "L3 Trigger Table"); 136 printf(" </td></tr><tr><td>\n"); 137 PrintPullDown($host, $user, $pw, $db, "MagicNumber", "fMagicNumberName", "fMagicNumberKEY", "Magic Number"); 138 printf(" </td><td>\n"); 139 PrintPullDown($host, $user, $pw, $db, "ObservationMode", "fObservationModeName", "fObservationModeKEY", "Obs. Mode"); 140 printf(" </td><td>\n"); 141 PrintPullDown($host, $user, $pw, $db, "SumTriggerFlag", "fSumTriggerFlagName", "fSumTriggerFlagKEY", "SumTrigger Flag"); 142 printf(" </td><td>\n"); 132 143 PrintPullDown($host, $user, $pw, $db, "TriggerDelayTable", "fTriggerDelayTableName", "fTriggerDelayTableKEY", "Trigger Delay Table"); 133 144 printf(" </td></tr><tr><td>\n"); 134 PrintPullDown($host, $user, $pw, $db, "MagicNumber", "fMagicNumberName", "fMagicNumberKEY", "Magic Number"); 135 printf(" </td><td>\n"); 136 PrintPullDown($host, $user, $pw, $db, "ObservationMode", "fObservationModeName", "fObservationModeKEY", "Obs. Mode"); 137 printf(" </td><td>\n"); 138 printf(" </td><td>\n"); 139 PrintPullDown($host, $user, $pw, $db, "SumTriggerFlag", "fSumTriggerFlagName", "fSumTriggerFlagKEY", "SumTrigger Flag"); 145 PrintPullDown($host, $user, $pw, $db, "Cycle", "fCycleName", "fCycleKEY", "Cycle"); 146 printf(" </td><td>\n"); 147 PrintPullDown($host, $user, $pw, $db, "PI", "fPIName", "fPIKEY", "PI"); 148 printf(" </td><td>\n"); 149 PrintPullDown($host, $user, $pw, $db, "WorkingGroup", "fWorkingGroupName", "fWorkingGroupKEY", "Working Group"); 150 printf(" </td><td>\n"); 151 PrintPullDown($host, $user, $pw, $db, "Proposal", "fProposalName", "fProposalKEY", "Proposal"); 140 152 printf(" </td></tr></table>\n"); 141 153 printf(" </div><p>\n"); … … 188 200 printf(" </td><td>\n"); 189 201 PrintPullDown($host, $user, $pw, $db, "L1TriggerTable", "fL1TriggerTableName", "fL1TriggerTableKEY", "L1Trigger Table"); 202 printf(" </td><td>\n"); 203 PrintPullDown($host, $user, $pw, $db, "Cycle", "fCycleName", "fCycleKEY", "Cycle"); 190 204 printf(" </td></tr><tr><td>\n"); 191 205 PrintPullDown($host, $user, $pw, $db, "LightConditions", "fLightConditionsName", "fLightConditionsKEY", "Light Conditions"); … … 194 208 printf(" </td><td>\n"); 195 209 PrintPullDown($host, $user, $pw, $db, "L2TriggerTable", "fL2TriggerTableName", "fL2TriggerTableKEY", "L2Trigger Table"); 210 printf(" </td><td>\n"); 211 PrintPullDown($host, $user, $pw, $db, "PI", "fPIName", "fPIKEY", "PI"); 196 212 printf(" </td></tr><tr><td>\n"); 197 213 PrintPullDown($host, $user, $pw, $db, "ObservationMode", "fObservationModeName", "fObservationModeKEY", "Obs. Mode"); … … 199 215 PrintPullDown($host, $user, $pw, $db, "DiscriminatorThresholdTable", "fDiscriminatorThresholdTableName", "fDiscriminatorThresholdTableKEY", "DT Table"); 200 216 printf(" </td><td>\n"); 217 PrintPullDown($host, $user, $pw, $db, "L3TriggerTable", "fL3TriggerTableName", "fL3TriggerTableKEY", "L3Trigger Table"); 218 printf(" </td><td>\n"); 219 PrintPullDown($host, $user, $pw, $db, "WorkingGroup", "fWorkingGroupName", "fWorkingGroupKEY", "Working Group"); 220 printf(" </td></tr><tr><td>\n"); 221 PrintPullDown($host, $user, $pw, $db, "SumTriggerFlag", "fSumTriggerFlagName", "fSumTriggerFlagKEY", "SumTrigger Flag"); 222 printf(" </td><td>\n"); 201 223 PrintPullDown($host, $user, $pw, $db, "TriggerDelayTable", "fTriggerDelayTableName", "fTriggerDelayTableKEY", "Trigger Delay Table"); 202 printf(" </td></tr><tr><td>\n"); 203 printf(" </td><td>\n"); 204 printf(" </td><td>\n"); 205 PrintPullDown($host, $user, $pw, $db, "SumTriggerFlag", "fSumTriggerFlagName", "fSumTriggerFlagKEY", "SumTrigger Flag"); 224 printf(" </td><td>\n"); 225 printf(" </td><td>\n"); 226 PrintPullDown($host, $user, $pw, $db, "Proposal", "fProposalName", "fProposalKEY", "Proposal"); 206 227 // printf(" </td><td>\n"); 207 228 // PrintPullDown($host, $user, $pw, $db, "ManuallyChanged", "fManuallyChangedName", "fManuallyChangedKEY", "Manually changed"); … … 730 751 $_GET["fL2TriggerTableName"]="Off"; 731 752 753 if (empty($_GET["fL3TriggerTableName"])) 754 $_GET["fL3TriggerTableName"]="Off"; 755 732 756 if (empty($_GET["fHvSettingsName"])) 733 757 $_GET["fHvSettingsName"]="Off"; … … 744 768 if (empty($_GET["fTestFlagName"])) 745 769 $_GET["fTestFlagName"]="Off"; 770 771 if (empty($_GET["fCycleName"])) 772 $_GET["fCycleName"]="Off"; 773 774 if (empty($_GET["fPIName"])) 775 $_GET["fPIName"]="Off"; 776 777 if (empty($_GET["fWorkingGroupName"])) 778 $_GET["fWorkingGroupName"]="Off"; 779 780 if (empty($_GET["fProposalName"])) 781 $_GET["fPropsalName"]="Off"; 746 782 } 747 783 … … 835 871 if (empty($_GET["fL2RatePresc"])) 836 872 $_GET["fL2RatePresc"]="Off"; 873 874 if (empty($_GET["fL3TriggerRate"])) 875 $_GET["fL3TriggerRate"]="Off"; 876 877 if (empty($_GET["fWheelPos1"])) 878 $_GET["fWheelPos1"]="Off"; 879 880 if (empty($_GET["fWheelPos2"])) 881 $_GET["fWheelPos2"]="Off"; 837 882 838 883 if (empty($_GET["fL2RateUnpresc"]))
Note:
See TracChangeset
for help on using the changeset viewer.
