Changeset 7547 for trunk/MagicSoft/Mars

Timestamp:

02/28/06 20:58:45 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• datacenter/db/findoffdata.php (modified) (3 diffs)
• datacenter/db/magicdefs.php (modified) (3 diffs)
• datacenter/db/runinfo.php (modified) (1 diff)
• datacenter/db/sequinfo.php (modified) (8 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
 
    * datacenter/db/*.php:
-     - moved user, host and pw of database to the include file db.php
+     - moved user, host and pw of database to the include file 
+       db.php
 
    * datacenter/db/index.html:
@@ -32 +33 @@
    * datacenter/db/querymc.php,magicdefs.php:
      - added some variables 
+
+   * datacenter/db/runinfo.php,sequinfo.php:
+     - bugfix (incl. TestSources)
+
+   * datacenter/db/sequinfo.php:
+     - changed init values
+
+   * datacenter/db/sequinfo.php, findoffdata.php, magicdefs.php:
+     - added value (relative ontime)
 
 

trunk/MagicSoft/Mars/datacenter/db/findoffdata.php

@@ -379 +379 @@
 
         if (empty($_GET["fEffOnTime"]))
-            $_GET["fEffOnTime"]="Off";
+            $_GET["fEffOnTime"]=$first?"On":"";
+
+        if (empty($_GET["fEffOnTime/fRunTime"]))
+            $_GET["fEffOnTime/fRunTime"]=$first?"On":"";
 
         if (empty($_GET["fMuonRate"]))
@@ -435 +438 @@
         CheckBox("fIsolatedOuter",       "Isolated outer");
         CheckBox("fIsolatedMaxCluster",  "IsolatedMaxCl.");
+        CheckBox("fMaxHumidity",        "MaxHumidity");
 
         printf("  </tr><tr>\n");
@@ -469 +473 @@
         CheckBox("fMuonNumber",         "MuonNumber");
         CheckBox("fEffOnTime",          "EffOnTime");
-        CheckBox("fMaxHumidity",        "MaxHumidity");
+        CheckBox("fEffOnTime/fRunTime", "RelOnTime");
         CheckBox("fDataRate",           "CleanedEvtRate");
 

trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

@@ -210 +210 @@
      "fMuonNumber"                      => "#<br>Muons",
      "fEffOnTime"                       => "EffOn<br>Time<br>[s]",
+     "fEffOnTime/fRunTime"              => "RelOn<br>Time",
      "fEffOnTime/3600"                  => "EffOn<br>Time<br>[h]",
      "fMuonRate"                        => "Muon<br>Rate<br>[Hz]",
@@ -314 +315 @@
      $alias["fMuonNumber"]               => "1",
      $alias["fEffOnTime"]                => "1",
+     $alias["fEffOnTime/fRunTime"]       => "1",
      $alias["fEffOnTime/3600"]           => "1",
      $alias["fMuonRate"]                 => "1",
@@ -457 +459 @@
          "fMuonNumber"                       => "Star.fMuonNumber",
          "fEffOnTime"                        => "fEffOnTime",
+         "fEffOnTime/fRunTime"               => "Sequences.fRunTime/Star.fEffOnTime",
          "fEffOnTime/3600"                   => "fEffOnTime/3600",
 //         "fEffOnTime"                        => $fromtable . ".fEffOnTime",

trunk/MagicSoft/Mars/datacenter/db/runinfo.php

@@ -67 +67 @@
         if ($_GET["fTest"]!="On")
         {
-            if ($_GET["fSource"]!="On")
+            if ($_GET["fSourceName"]!="On")
                 $query0 .= " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY ";
             $query0 .= " WHERE fTest='no'";

trunk/MagicSoft/Mars/datacenter/db/sequinfo.php

@@ -85 +85 @@
         if ($_GET["fTest"]!="On")
         {
-            if ($_GET["fSource"]!="On")
+            if ($_GET["fSourceName"]!="On")
                 $query0 .= " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY ";
             $query0 .= " WHERE fTest='no'";
@@ -210 +210 @@
 
         if (empty($_GET["fNumEvents"]))
-            $_GET["fNumEvents"]=$first?"On":"";
+            $_GET["fNumEvents"]="Off";
 
         if (empty($_GET["fRunStart"]))
@@ -219 +219 @@
 
         if (empty($_GET["fSequenceLast"]))
-            $_GET["fSequenceLast"]=$first?"On":"";
+            $_GET["fSequenceLast"]="Off";
 
         if (empty($_GET["fLinks"]))
@@ -225 +225 @@
 
         if (empty($_GET["fTest"]))
-            $_GET["fTest"]=$first?"On":"";
+            $_GET["fTest"]="Off";
 
         if (empty($_GET["fAzimuthMin"]))
@@ -357 +357 @@
 
         if (empty($_GET["fConvFactorOuter"]))
-            $_GET["fConvFactorOuter"]=$first?"On":"";
+            $_GET["fConvFactorOuter"]="Off";
 
         if (empty($_GET["fMeanNumberIslands"]))
@@ -373 +373 @@
         if (empty($_GET["fEffOnTime"]))
             $_GET["fEffOnTime"]="Off";
+
+        if (empty($_GET["fEffOnTime/fRunTime"]))
+            $_GET["fEffOnTime/fRunTime"]="Off";
 
         if (empty($_GET["fMuonRate"]))
@@ -496 +499 @@
         printf("  <tr>\n");
 
+        CheckBox("fDataRate",           "CleanedEvtRate");
         CheckBox("fMeanNumberIslands",  "MeanNumIslands");
-        CheckBox("fPSF",                "PSF");
-        CheckBox("fRatio",              "Ratio");
+        CheckBox("fMaxHumidity",        "MaxHumidity");
+        CheckBox("fInhomogeneity",      "Inhomogeneity");
 
         printf("  </tr><tr>\n");
@@ -504 +508 @@
         CheckBox("fMuonRate",           "MuonRate");
         CheckBox("fMuonNumber",         "MuonNumber");
+        CheckBox("fRatio",              "Ratio");
+        CheckBox("fPSF",                "PSF");
+
+        printf("  </tr><tr>\n");
+
         CheckBox("fEffOnTime",          "EffOnTime");
-
-        printf("  </tr><tr>\n");
-
-        CheckBox("fMaxHumidity",        "MaxHumidity");
-        CheckBox("fDataRate",           "CleanedEvtRate");
-        CheckBox("fInhomogeneity",      "Inhomogeneity");
+        CheckBox("fEffOnTime/fRunTime", "RelOnTime");
 
         printf("  </tr>\n");