Changeset 28601

Timestamp:

Jul 2, 2010, 3:30:28 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Plots

Location:

trunk/ippMonitor

Files:

• Makefile.in (modified) (6 diffs)
• def/autocodeImage.php (added)
• def/histogramBackgroundImage.d (added)
• def/histogramBackgroundImage.php (added)
• def/histogramCamProcessedExpImage.d (added)
• def/histogramChipProcessedImfileFwhmMajorImage.d (added)
• def/histogramChipRunFwhmMajorImage.d (added)
• def/histogramFwhmMajorImage.d (added)
• def/histogramFwhmMinorImage.d (added)
• def/image_autocode.php (added)
• def/scatterCpiBgReMaImage.d (added)
• def/scatterCpiBgReMpImage.d (added)
• def/scatterCpiBgReSaImage.d (added)
• def/scatterPlotAirMassFwhmImage.d (added)
• def/simplePlotChipImage.d (added)
• def/simplePlotRawImage.d (added)
• raw/ipp.imfiles.dat (modified) (1 diff)
• raw/ipp.menu.dat (modified) (1 diff)
• raw/ipp.php (modified) (1 diff)
• raw/ipp.plots.dat (added)
• raw/ipp.plots.php (added)
• raw/plotHistogram.php (added)
• raw/scatterPlot.php (added)
• raw/skyplot.php (modified) (2 diffs)
• scripts/build_histogram.dvo (modified) (1 diff)
• scripts/generate (modified) (6 diffs)
• scripts/helpers.dvo (added)
• scripts/plot_x_vs_y.dvo (added)

trunk/ippMonitor/Makefile.in

@@ -18 +18 @@
 $(DESTBIN)/czartool_getServerStatus.pl \
 $(DESTBIN)/build_histogram.dvo \
-
+$(DESTBIN)/helpers.dvo \
+$(DESTBIN)/plot_x_vs_y.dvo
 
 RAWSRC = \
@@ -36 +37 @@
 $(DESTWWW)/ipp.load.dat \
 $(DESTWWW)/ipp.load.php \
+$(DESTWWW)/ipp.plots.dat \
+$(DESTWWW)/ipp.plots.php \
 $(DESTWWW)/ipp.science.dat \
 $(DESTWWW)/ipp.science.php \
@@ -55 +58 @@
 $(DESTWWW)/histogram.php \
 $(DESTWWW)/show_and_delete_image.php \
+$(DESTWWW)/scatterPlot.php \
+$(DESTWWW)/select_forms.php \
+$(DESTWWW)/plotHistogram.php \
 
 
@@ -178 +184 @@
 $(DESTWWW)/flatcorrChip.php \
 $(DESTWWW)/flatcorrCamera.php \
-$(DESTWWW)/maskStats.php
+$(DESTWWW)/maskStats.php \
+$(DESTWWW)/simplePlotRawImage.php \
+$(DESTWWW)/simplePlotChipImage.php \
+$(DESTWWW)/simplePlotCamImage.php \
+$(DESTWWW)/histogramBackgroundImage.php \
+$(DESTWWW)/histogramCamProcessedExpImage.php \
+$(DESTWWW)/histogramChipProcessedImfileFwhmMajorImage.php \
+$(DESTWWW)/scatterPlotAirMassFwhmImage.php \
+$(DESTWWW)/scatterCpiBgReMaImage.php \
+$(DESTWWW)/scatterCpiBgReMpImage.php \
+$(DESTWWW)/scatterCpiBgReSaImage.php
 
 PICTURES = \
@@ -206 +222 @@
         ln -s $(DESTWWW)/Login.php $@
 
+$(SRC)/%Image.php: $(DEF)/%Image.d $(DEF)/autocodeImage.php $(GENERATE)
+        @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
+        $(GENERATE) $< $(DEF)/autocodeImage.php $@
 $(SRC)/%.php: $(DEF)/%.d $(DEF)/autocode.php $(GENERATE)
         @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
@@ -211 +230 @@
 
 # generated php code is built into SRC first
+$(DESTWWW)/%Image.php: $(SRC)/%Image.php
+        @if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
+        rm -f $(DESTWWW)/$*Image.php || exit
+        cp $(SRC)/$*Image.php $(DESTWWW)/$*Image.php || exit
 $(DESTWWW)/%.php: $(SRC)/%.php
         @if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi

trunk/ippMonitor/raw/ipp.imfiles.dat

@@ -24 +24 @@
 menutop   | menutop      | link    | mask stats                   | maskStats.php
 menutop   | menutop      | link    | histogram                    | histogram.php
+menutop   | menutop      | link    | Scatter plot                 | plot_x_vs_y.php
+
+menutop   | menutop      | link    | Simple plot - raw            | simplePlotRawImage.php
+menutop   | menutop      | link    | Simple plot - chip            | simplePlotChipImage.php
+menutop   | menutop      | link    | Simple plot - cam            | simplePlotCamImage.php
+menutop   | menutop      | link    | Histogram background     | histogramBackgroundImage.php
+menutop   | menutop      | link    | Histogram Fwhm Major (camProcessedExp)     | histogramCamProcessedExpImage.php
+menutop   | menutop      | link    | Histogram Fwhm Minor (chip processed)     | histogramChipProcessedImfileFwhmMajorImage.php

trunk/ippMonitor/raw/ipp.menu.dat

@@ -24 +24 @@
 menutop   | menutop      | link    | Distribution                 | ipp.dist.php
 menutop   | menutop      | link    | Calibration                  | ipp.cal.php
+menutop   | menutop      | link    | Plots                        | ipp.plots.php
 menutop   | menutop      | link    | Admin and Debug              | ipp.imfiles.php
 

trunk/ippMonitor/raw/ipp.php

@@ -871 +871 @@
 }
 
+//////////////////////////////////////////////////////////////////////////
+// Extra filtering parameters array
+$filteringParameters = array();
+
 ?>

trunk/ippMonitor/raw/skyplot.php

@@ -47 +47 @@
 $outfile = $_GET[output];
 
-exec ("skyplot.dvo $infile $outfile", $output, $status);
+$output = shell_exec("skyplot.dvo $infile $outfile");//, $output, $status);
 
 if ($debug) {
@@ -65 +65 @@
   fpassthru ($file);
 }
-exit ();
+
+exit();
+
 ?>

trunk/ippMonitor/scripts/build_histogram.dvo

@@ -37 +37 @@
   plot dx vhist -x 1 -c blue
   $binsCount = dx[]
-  myecho "  Labeling"
-  myecho "    -x $3"
+  strsub $3 "_" "\\\\_" -var xLabel
+  myecho "  Labelling"
+  myecho "    -x $xLabel"
   myecho "    -y Occurrences "
-  myecho "    +x 'Histogram of $3 "
+  myecho "    +x 'Histogram of $xLabel "
   myecho "           interval = $minvalue : $maxvalue "
   myecho "           / $binsCount bins"
   myecho "           / bin width: $delta)'"
-  labels -x $3
+  labels -x $xLabel
   labels -y Occurrences
-  labels +x "Histogram of $3 / interval = $minvalue : $maxvalue / $binsCount bins / bin width: $delta"
+  labels +x "Histogram of $xLabel / interval = $minvalue : $maxvalue / $binsCount bins / bin width: $delta"
 
   myecho "Saving graphics to [$2]"

trunk/ippMonitor/scripts/generate

@@ -35 +35 @@
     &init_key ("FIELDS");
     &init_key ("GROUPS");
+    &init_key ("TOPLOT");
+    &init_key ("PLOTTER");
+    &init_key ("PLOTTITLE");
 
     foreach $line (@list) {
@@ -43 +46 @@
         if ($key eq "TABLE") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
         if ($key eq "TYPE")  { ($value) = $value =~ m|^\s*(.+)\s*$|; }
+        if ($key eq "TOPLOT") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
+        if ($key eq "PLOTTER") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
+        if ($key eq "PLOTTITLE") { 
+            ($value) = $value =~ m|^\s*(.+)\s*$|;
+            $value =~ s/\s/_/g;
+        }
 
         &set_keypair ($key, $value);
@@ -253 +262 @@
 # generate a table header cell (<th> </th>) for each field (show != none)
 sub write_table_header {
-
     # print the table header (field labels)
     print FILE "echo \"<tr><td></td>\\n\";\n";
@@ -682 +690 @@
         if ($key eq $key[$i]) {
             if ($VERBOSE) { print "found $key: $key[$i]  -- $value[$i] (def: $default)\n"; }
-            if (($default eq "") && ($value[$i] eq "")) { die "missing value for required key $key[$i]\n"; }
+            if (($default eq "") && ($value[$i] eq "")) { die "check_key: missing value for required key $key[$i]\n"; }
             if ($value[$i] eq "") { $value[$i] = $default; }
             return;
@@ -695 +703 @@
         if ($VERBOSE) { print "$key[$i]  -- $value[$i]\n"; }
         if ($line =~ m|\$$key[$i]|) {
-            if ($value[$i] eq "") { die "missing value for required key $key[$i]\n"; }
+            if ($value[$i] eq "") { die "check_keypairs: missing value for required key $key[$i]\n"; }
             $line =~ s|\$$key[$i]|$value[$i]|g;
         }
@@ -708 +716 @@
 # against the expectation at runtime.  for the moment,
 # calculate by hand and add to def.d file
-