Changeset 34466 for branches/eam_branches/ipp-20120905/ippMonitor

Timestamp:

Sep 25, 2012, 10:05:21 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905/ippMonitor

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (3 diffs)
• def/simplePlotCamImage.d (modified) (3 diffs)
• def/simplePlotSkycalImage.d (copied) (copied from trunk/ippMonitor/def/simplePlotSkycalImage.d )
• def/simplePlotStackImage.d (copied) (copied from trunk/ippMonitor/def/simplePlotStackImage.d )
• def/simplePlotStaticskyImage.d (copied) (copied from trunk/ippMonitor/def/simplePlotStaticskyImage.d )
• raw/ipp.plots.dat (modified) (1 diff)
• raw/simplePlotcam.php (modified) (8 diffs)
• raw/skycellplot.php (copied) (copied from trunk/ippMonitor/raw/skycellplot.php )
• scripts/skycellplot.dvo (copied) (copied from trunk/ippMonitor/scripts/skycellplot.dvo )

branches/eam_branches/ipp-20120905/ippMonitor/Makefile.in

@@ -14 +14 @@
 PROGRAMS = \
 $(DESTBIN)/skyplot.dvo \
+$(DESTBIN)/skycellplot.dvo \
 $(DESTBIN)/czartool_getServerStatus.pl \
 $(DESTBIN)/czartool_revert.pl \
@@ -57 +58 @@
 $(DESTWWW)/simplePlotraw.php \
 $(DESTWWW)/skyplot.php \
+$(DESTWWW)/skycellplot.php \
 $(DESTWWW)/getimage.php \
 $(DESTWWW)/ipp.czartool.dat \
@@ -211 +213 @@
 $(DESTWWW)/simplePlotChipImage.php \
 $(DESTWWW)/simplePlotCamImage.php \
+$(DESTWWW)/simplePlotStackImage.php \
+$(DESTWWW)/simplePlotStaticskyImage.php \
+$(DESTWWW)/simplePlotSkycalImage.php \
 $(DESTWWW)/histogramBackgroundImage.php \
 $(DESTWWW)/histogramCamProcessedExpImage.php \

branches/eam_branches/ipp-20120905/ippMonitor/def/simplePlotCamImage.d

@@ -1 @@
-TABLE camRun, chipRun, rawExp
+TABLE camProcessedExp, camRun, chipRun, rawExp
 TITLE New sky plot - cam
 FILE  simplePlotCamImage.php
@@ -7 +7 @@
 WHERE chipRun.exp_id = rawExp.exp_id
 WHERE camRun.chip_id = chipRun.chip_id
+WHERE camProcessedExp.cam_id = camRun.cam_id
 
 #    field                size  format  name           show     link to         extras
@@ -24 +25 @@
 FIELD rawExp.bg,                  5, %.2f,   backgnd,         restrict
 FIELD rawExp.bg_stdev,            5, %.2f,   stdev,           restrict
+FIELD camProcessedExp.fwhm_major, 5, %.2f,   FWHM_major,      restrict      
 
 # What to plot

branches/eam_branches/ipp-20120905/ippMonitor/raw/ipp.plots.dat

@@ -5 +5 @@
 menulink  | menuselect      | link    | Simple plot - chip                  | simplePlotChipImage.php
 menulink  | menuselect      | link    | Simple plot - cam                   | simplePlotCamImage.php
+menulink  | menuselect      | link    | Simple plot - stack                 | simplePlotStackImage.php
+menulink  | menuselect      | link    | Simple plot - staticsky             | simplePlotStaticskyImage.php
+menulink  | menuselect      | link    | Simple plot - skycal             | simplePlotSkycalImage.php
 
 menutop   | menutop      | plain   |                                   | 

branches/eam_branches/ipp-20120905/ippMonitor/raw/simplePlotcam.php

@@ -28 +28 @@
 // define restrictiosn to the queries
 // ** TABLE RESTRICTIONS **
-$WHERE = "WHERE camRun.state != 'new' AND chipRun.exp_id = rawExp.exp_id AND camRun.chip_id = chipRun.chip_id";
+$WHERE = "WHERE camRun.state != 'new' AND chipRun.exp_id = rawExp.exp_id AND camRun.chip_id = chipRun.chip_id AND camProcessedExp.cam_id = camRun.cam_id";
 $WHERE = check_restrict ('rawExp.exp_name', $WHERE, 'string', 1.0);
 $WHERE = check_restrict ('rawExp.exp_id', $WHERE, 'string', 1.0);
@@ -62 +62 @@
 $WHERE = check_restrict ('rawExp.bg_stdev', $WHERE, 'max', 1.0);
 $WHERE = check_restrict ('rawExp.comment', $WHERE, 'string', 1.0);
+$WHERE = check_restrict ('camProcessedExp.fwhm_major', $WHERE, 'string', 1.0);
+$WHERE = check_restrict ('camProcessedExp.fwhm_major', $WHERE, 'min', 1.0);
+$WHERE = check_restrict ('camProcessedExp.fwhm_major', $WHERE, 'max', 1.0);
 $WHERE = check_ordering ('', $WHERE);
 
@@ -73 +76 @@
 
 // get the result table count
-$sql = "SELECT count(*) FROM camRun, chipRun, rawExp $WHERE";
+$sql = "SELECT count(*) FROM camProcessedExp, camRun, chipRun, rawExp $WHERE";
 
 $qry = $db->query($sql);
 if (dberror($qry)) {
-  echo "<b>error reading camRun, chipRun, rawExp table count</b><br>\n";
+  echo "<b>error reading camProcessedExp, camRun, chipRun, rawExp table count</b><br>\n";
   echo "<br><small><b> count query : $sql </b></small><br>\n";
   menu_end();
 }
 if (!$qry->fetchInto($row)) {
-  echo "<b>error reading camRun, chipRun, rawExp table count</b><br>\n";
+  echo "<b>error reading camProcessedExp, camRun, chipRun, rawExp table count</b><br>\n";
   echo "<br><small><b> count query : $sql </b></small><br>\n";
   menu_end();
@@ -128 +131 @@
 $buttonLink = button_restrict_max ('rawExp.bg_stdev', $buttonLink);
 $buttonLink = button_restrict_string ('rawExp.comment', $buttonLink);
-
+$buttonLink = button_restrict_string ('camProcessedExp.fwhm_major', $buttonLink);
+$buttonLink = button_restrict_min ('camProcessedExp.fwhm_major', $buttonLink);
+$buttonLink = button_restrict_max ('camProcessedExp.fwhm_major', $buttonLink);
 // set up the table
 echo "<table class=list>\n";
@@ -181 +186 @@
 write_header_cell ("list", "stdev    ");
 write_header_cell ("list", "Date/Time");
+write_header_cell ("list", "Cam FWHM_major");
 echo "</tr>\n";
 
@@ -193 +199 @@
 write_query_row ('rawExp.bg_stdev', 5, 'min');
 write_query_row ('rawExp.dateobs', 19, 'min');
+write_query_row ('camProcessedExp.fwhm_major', 5, 'min');
 echo "</tr><tr><td>&le;</td>\n";
 echo "<td> &nbsp; </td>\n";
@@ -201 +208 @@
 write_query_row ('rawExp.bg_stdev', 5, 'max');
 write_query_row ('rawExp.dateobs', 19, 'max');
+write_query_row ('camProcessedExp.fwhm_major', 5, 'max');
 echo "</tr>\n";
 
@@ -228 +236 @@
 
 // query the database
-$sql = "SELECT rawExp.ra,rawExp.decl,rawExp.filter FROM camRun, chipRun, rawExp $WHERE";
+$sql = "SELECT rawExp.ra,rawExp.decl,rawExp.filter FROM camProcessedExp, camRun, chipRun, rawExp $WHERE";
 
 $qry = $db->query($sql);