Changeset 12694
- Timestamp:
- 12/03/11 00:17:04 (13 years ago)
- Location:
- trunk/Mars/datacenter/db
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Mars/datacenter/db/fact_runinfo.php
r12665 r12694 25 25 $query0 .= " Concat(fRunNumber,'_', LPAD(fFileNumber, 3, 0)) as 'Run' "; 26 26 27 foreach ($_GET as $key => $element) 28 if ($_GET[$key]=="On") 29 if ($key!="fComments") 30 if (empty($checkwhere[$key]) || $checkwhere[$key]==0) 31 $query0 .= ", " . $key . " as '" . $alias[$key] . "' "; 32 27 33 if (!empty($_GET["fComments"])) 28 34 { … … 31 37 } 32 38 33 foreach ($_GET as $key => $element)34 if ($_GET[$key]=="On")35 if ($key!="fComments")36 if (empty($checkwhere[$key]) || $checkwhere[$key]==0)37 $query0 .= ", " . $key . " as '" . $alias[$key] . "' ";38 39 } 39 40 … … 191 192 $_GET["fRunTypeName"]=$first?"On":""; 192 193 194 if (empty($_GET["fTriggerRateMedian"])) 195 $_GET["fTriggerRateMedian"]=$first?"On":""; 196 197 if (empty($_GET["fThresholdMedian"])) 198 $_GET["fThresholdMedian"]=$first?"On":""; 199 200 if (empty($_GET["fBiasVoltageMedian"])) 201 $_GET["fBiasVoltageMedian"]=$first?"On":""; 202 203 if (empty($_GET["fRightAscension"])) 204 $_GET["fRightAscension"]=$first?"On":""; 205 206 if (empty($_GET["fDeclination"])) 207 $_GET["fDeclination"]=$first?"On":""; 208 193 209 } 194 210 … … 241 257 CheckBox("fMd5sumRaw", "md5"); 242 258 CheckBox("fMd5sumRawZip", "md5(gz)"); 259 260 printf(" </tr>\n"); 261 printf(" <tr>\n"); 262 263 CheckBox("fTriggerRateMedian", "mean rate"); 264 CheckBox("fThresholdMedian", "mean threshold"); 265 CheckBox("fBiasVoltageMedian", "mean voltage"); 266 CheckBox("fRightAscension", "RA"); 267 CheckBox("fDeclination", "Dec"); 243 268 244 269 printf(" </tr>\n"); -
trunk/Mars/datacenter/db/factdefs.php
r12666 r12694 45 45 "fNumOtherTrigger" => "#Other", 46 46 "Round(Sum(TimeDiff(fRunStop,fRunStart))/60./60.,1)" => "Time [h]", 47 "fTriggerRateMedian" => "mean rate", 48 "fBiasVoltageMedian" => "mean bias", 49 "fThresholdMedian" => "mean threshold", 50 "fRightAscension" => "RA", 51 "fDeclination" => "Decl", 47 52 ); 48 53
Note:
See TracChangeset
for help on using the changeset viewer.