Changeset 12694 for trunk

Timestamp:

12/03/11 00:17:04 (13 years ago)

Author:

Daniela Dorner

Message:

added new database values

Location:

trunk/Mars/datacenter/db

Files:

• fact_runinfo.php (modified) (4 diffs)
• factdefs.php (modified) (1 diff)

trunk/Mars/datacenter/db/fact_runinfo.php

@@ -25 +25 @@
             $query0 .= " Concat(fRunNumber,'_', LPAD(fFileNumber, 3, 0)) as 'Run' ";
 
+            foreach ($_GET as $key => $element)
+                if ($_GET[$key]=="On")
+                    if ($key!="fComments")
+                        if (empty($checkwhere[$key]) || $checkwhere[$key]==0)
+                            $query0 .= ", " . $key . " as '" . $alias[$key] . "' ";
+
             if (!empty($_GET["fComments"]))
             {
@@ -31 +37 @@
             }
 
-            foreach ($_GET as $key => $element)
-                if ($_GET[$key]=="On")
-                    if ($key!="fComments")
-                        if (empty($checkwhere[$key]) || $checkwhere[$key]==0)
-                            $query0 .= ", " . $key . " as '" . $alias[$key] . "' ";
         }
 
@@ -191 +192 @@
             $_GET["fRunTypeName"]=$first?"On":"";
 
+        if (empty($_GET["fTriggerRateMedian"]))
+            $_GET["fTriggerRateMedian"]=$first?"On":"";
+
+        if (empty($_GET["fThresholdMedian"]))
+            $_GET["fThresholdMedian"]=$first?"On":"";
+
+        if (empty($_GET["fBiasVoltageMedian"]))
+            $_GET["fBiasVoltageMedian"]=$first?"On":"";
+
+        if (empty($_GET["fRightAscension"]))
+            $_GET["fRightAscension"]=$first?"On":"";
+
+        if (empty($_GET["fDeclination"]))
+            $_GET["fDeclination"]=$first?"On":"";
+
     }
 
@@ -241 +257 @@
         CheckBox("fMd5sumRaw",         "md5");
         CheckBox("fMd5sumRawZip",      "md5(gz)");
+
+        printf("  </tr>\n");
+        printf("  <tr>\n");
+
+        CheckBox("fTriggerRateMedian",    "mean rate");
+        CheckBox("fThresholdMedian",    "mean threshold");
+        CheckBox("fBiasVoltageMedian",    "mean voltage");
+        CheckBox("fRightAscension",    "RA");
+        CheckBox("fDeclination",    "Dec");
 
         printf("  </tr>\n");

trunk/Mars/datacenter/db/factdefs.php

@@ -45 +45 @@
      "fNumOtherTrigger"                 => "#Other",
      "Round(Sum(TimeDiff(fRunStop,fRunStart))/60./60.,1)"  => "Time [h]",
+     "fTriggerRateMedian"               => "mean rate",
+     "fBiasVoltageMedian"               => "mean bias",
+     "fThresholdMedian"                 => "mean threshold",
+     "fRightAscension"                  => "RA",
+     "fDeclination"                     => "Decl",
     );