Changeset 8273 for trunk/MagicSoft/Mars

Timestamp:

01/27/07 13:29:08 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/builddatasets.php (modified) (6 diffs)
• datacenter/db/ganymed.php (modified) (5 diffs)
• datacenter/db/index.html (modified) (1 diff)
• datacenter/db/showplots.php (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/01/27 Daniela Dorner
+
+   * datacenter/db/showplots.php:
+     - added (tool to click through the calib, signal and star plots of
+       one sequence) 
+
+   * datacenter/db/index.html:
+     - added link to new plot tool 
+
+   * datacenter/db/ganymed.php:
+     - added fDataSetName, removed fWobble
+     - removed mininmum value of 100 for dataset range
+
+   * datacenter/db/builddatasets.php:
+     - added fIsoInLimit2 and fIMCLimit2 in Init
+     - added check on observation mode
+
+
 
  2007/01/26 Thomas Bretz

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

@@ -301 +301 @@
             $_GET["fIMCLimit1"]=$first?"00":"";
 
+        if (empty($_GET["fIMCLimit2"]))
+            $_GET["fIMCLimit2"]=$first?"00":"";
+
         if (empty($_GET["fIsoInLimit1"]))
             $_GET["fIsoInLimit1"]=$first?"00":"";
+
+        if (empty($_GET["fIsoInLimit2"]))
+            $_GET["fIsoInLimit2"]=$first?"00":"";
 
         if (empty($_GET["fInhomLimitMean"]))
@@ -563 +569 @@
                              );
                 //get runtimes of dataset
-                function GetSequenceValues($db_id, $sequences, $txt,&$values)
+                function GetSequenceValues($db_id, $sequences, $txt, &$values)
                 {
                     $query="SELECT COUNT(*) ";
@@ -616 +622 @@
 
                 //check observationmode for on-sequences
-                $query="SELECT fObservationModeKEY FROM Sequences where fSequenceFirst IN ('" . $sequences . "') GROUP BY fObservationModeKEY";
-//                printf("q: %s <br>", $query);
+                $query="SELECT fObservationModeKEY FROM Sequences where fSequenceFirst IN (" . $on . ") GROUP BY fObservationModeKEY";
                 $result = mysql_query($query, $db_id);
                 $numobskeys=mysql_num_rows($result);
@@ -711 +716 @@
                     {
                         printf("<li style='color:%s'>%s: You have selected more than one (%s) different observation modes for your on sequences",
-                               $color["ERROR"], "ERROR", $numobskeys);
-                        $numerr=$numerr+1;
+                               $color["ERROR"], "WARN", $numobskeys);
+//                        $numerr=$numerr+1;
+                    }
+                    if (empty($_POST["fObservationModeKEY"]) && !empty($_GET["obsmode"]))
+                        $_POST["fObservationModeKEY"]=$_GET["obsmode"];
+                    if ($_POST["fObservationModeKEY"]==3 && empty($off))
+                    {
+                        printf("<li style='color:%s'>%s: You have selected on/off mode, but you haven't chosen any off sequences.",
+                               $color["ERROR"], "WARN");
+//                        $numerr=$numerr+1;
                     }
                     if (empty($realsourcekey))
@@ -801 +814 @@
                     if (empty($_POST["comment"]) && !empty($_GET["comment"]))
                         $_POST["comment"]=$_GET["comment"];
-                    if (empty($_POST["fObservationModeKEY"]) && !empty($_GET["obsmode"]))
-                        $_POST["fObservationModeKEY"]=$_GET["obsmode"];
                     if (empty($_POST["fUserKEY"]) && !empty($_GET["username"]))
                         $_POST["fUserKEY"]=$_GET["username"];
@@ -851 +862 @@
                     printf("<table><tr><td colspan='2' align='center'>Dataset</td></tr>");
                     printf("<tr><td>proposed DataSet#: </td><td>%s</td></tr>", $dataset);
-                    printf("<tr><td>SequencesOn:</td><td> %s</td></tr>", $sequon);
+                    printf("<tr><td valign='top'>SequencesOn:</td><td> %s</td></tr>", $sequon);
                     if (!empty($sequoff))
-                        printf("<tr><td>SequencesOff:</td><td> %s</td></tr>", $sequoff);
+                        printf("<tr><td valign='top'>SequencesOff:</td><td> %s</td></tr>", $sequoff);
                     printf("<tr><td>Scale: </td><td>%0.2f</td></tr>", $scale);
                     printf("<tr><td>SourcenamesOn[%s]: </td><td>%s</td></tr>", str_word_count($sourceson), $sourceson);

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

@@ -5 +5 @@
         $query0  = "SELECT ";
         //datasets (0-3)
-        $query0 .= " DataSets.fDataSetNumber, fWobble, fComment, ";//0,1,2
+        $query0 .= " DataSets.fDataSetNumber, fDataSetName, fComment, ";//0,1,2
         $query0 .= " fSourceName, ";//3
         //steps (4-7)
@@ -70 +70 @@
 
         if (empty($_GET["fRunMin"]))
-            $min = "100";
-//            $min = GetMin("fDataSetNumber", "DataSets", $host, $user, $pw, $db);
+//            $min = "100";
+            $min = GetMin("fDataSetNumber", "DataSets", $host, $user, $pw, $db);
         else
             $min = $_GET["fRunMin"];
@@ -160 +160 @@
         {
             $datasetno=mysql_result($result0, $i, 0);
-            $wobble=mysql_result($result0, $i, 1);
+            $datasetname=mysql_result($result0, $i, 1);
             $comment=mysql_result($result0, $i, 2);
             $source=mysql_result($result0, $i, 3);
@@ -187 +187 @@
             printf(" </th></tr><tr>\n");
 
-            printf(" <td colspan=\"6\"> Wobble: %s", $wobble);
+            printf(" <td colspan=\"6\"> DatasetName: %s", $datasetname);
             if (!is_null($ganymed))
                 printf(", <font color='green'> ganymed done</font> ");
@@ -249 +249 @@
             }
             printf("<tr><td colspan=\"6\">\n Plots: ");
+
             if ($wobble=='Y')
                 $tabs=$ganymedtabsw;

trunk/MagicSoft/Mars/datacenter/db/index.html

@@ -51 +51 @@
 plots for quality parameter from callisto and star for all data since 21.8.2004</li>
 <li><A HREF="plotdb.php">Plots</A>: plot values from the database yourself online</li>
+<li><A HREF="showplots.php">All plots of one sequence</A>: click through all calib, signal and star plot of one sequence</li>
 </ul>
 <p>

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

@@ -53 +53 @@
 printf("<body>\n");
 
-//$type2= array("calib", "signal", "star");
 $seq=0;
 if (!empty($_GET["seq"]))
@@ -69 +68 @@
     $plot=getplotname($seq, $tabnum, $type, $type2);
 
+    //be careful: this has to be adapted in case tabs are removed or new tabs are added
     if (($type2=="calib" && $tabnum==12) || ($type2=="signal" && $tabnum==11) || ($type2=="star" && $tabnum==15))
     {
@@ -91 +91 @@
 else
     printf("You have to select a sequence.");
-//printf("<img src='http://vela.astro.uni-wuerzburg.de/datacenter/%s/%04d/%08d/%s%08d-tab%d.png'>",
-//       $type, $seqshort, $seq, $type2, $seq, $tabnum);
 printf("</td>\n</tr>\n</table>\n");
 printf("</form>\n");