Index: trunk/tools/czartool/DayMetrics.pm
===================================================================
--- trunk/tools/czartool/DayMetrics.pm (revision 29770)
+++ trunk/tools/czartool/DayMetrics.pm (revision 29863)
@@ -43,8 +43,8 @@
# create path, dir and html file
- $self->{dayDir} = "$self->{baseDir}/$self->{day}";
- rmdir($self->{dayDir});
- mkdir($self->{dayDir}, 0777);
- $self->{plotter}->setOutputPath($self->{dayDir});
+ $self->{path} = "$self->{baseDir}/$self->{day}";
+ rmdir($self->{path});
+ mkdir($self->{path}, 0777);
+ $self->{plotter}->setOutputPath($self->{path});
if ($self->{verbose}) {print "* Creating metrics for $self->{day}\n";}
@@ -64,10 +64,8 @@
# create HTML file and write header stuff
- open (HTMLDOC, ">$self->{dayDir}/index.html");
- print HTMLDOC "\n";
- print HTMLDOC "\n";
- print HTMLDOC "IPP Metrics for $self->{day}\n";
- print HTMLDOC "\n";
- print HTMLDOC "IPP Metrics for $self->{day}
\n";
+
+
+ $self->createHtml("IPP Metrics for $self->{day}");
+ my $htmlFile = $self->{htmlFile};
# summit and burntool exposures
@@ -79,11 +77,11 @@
my $nextDay = $self->{czarDb}->addInterval($self->{day}, "1 DAY");
- print HTMLDOC "";
- print HTMLDOC " \< previous day | next day \>
\n";
- print HTMLDOC "Measured from $self->{begin} to $self->{end} HST
\n";
- printf ( HTMLDOC "%d exposures taken on summit last night, %d through burntool today
\n",
+ print $htmlFile "";
+ print $htmlFile " \< previous day | all | next day \>
\n";
+ print $htmlFile "Measured from $self->{begin} to $self->{end} HST
\n";
+ printf ( $htmlFile "%d exposures taken on summit last night, %d through burntool today
\n",
$summitExposures, $burntoolMetrics->getProcessed() ? $burntoolMetrics->getProcessed() : 0 );
- print HTMLDOC "\n";
- print HTMLDOC "\n";
+ print $htmlFile "\n";
+ print $htmlFile "\n";
@@ -176,31 +174,27 @@
}
- # create hyperlink list of list of active labels
- print HTMLDOC "Active labels for this day\n";
+ # create contents
+ print $htmlFile "Contents
\n";
+ print $htmlFile "Survey timings
\n";
+ print $htmlFile "Summary plots
\n";
+ print $htmlFile "Stage totals
\n";
+ print $htmlFile "Magic mask fraction
\n";
foreach my $label (keys (%labelTables)) {
- print HTMLDOC "$label
\n";
- }
-
- # some plots
- print HTMLDOC "Summary plots
\n";
- $self->{plotter}->createTimeSeries("all_stdscience_labels", undef, $self->{begin}, $self->{end}, 0, 0, 0);
- print HTMLDOC "![\"All](\"czarplot_linear_all_stdscience_labels_all_stages_t.png\")
{day}\" />\n";
- $self->{plotter}->createHistogram("all_stdscience_labels", $self->{begin}, $self->{end}, 0, 0, 0);
- print HTMLDOC "![\"All](\"czarplot_linear_all_stdscience_labels_all_stages_h.png\")
{day}\" />\n";
- $self->{plotter}->createRateTimeSeries("all_stdscience_labels", undef, $self->{begin}, $self->{end}, "1 HOUR", 0);
- print HTMLDOC "![\"All](\"czarplot_linear_all_stdscience_labels_all_stages_r.png\")
{day}\" />\n";
- $self->{plotter}->plotMagicMaskFractionHistogram($self->{day}, $self->{day});
- print HTMLDOC "![\"\"](\"czarplot_magic_mask_fraction_h.png\")
\n";
- $self->{plotter}->plotStorageTimeSeries($self->{begin}, $self->{end});
- print HTMLDOC "![\"All](\"czarplot_cluster.png\")
{day}\" />\n";
- print HTMLDOC "![\"\"](\"czarplot_magic_mask_fraction_d.png\")
\n";
-
+ print $htmlFile "$label
\n";
+ }
# survey table
$self->printSurveyTable();
+ # some summary plots
+ $self->createSummaryPlots();
+
+ # magic mask plots
+ $self->createMaskPlots($self->{day}, $self->{day});
+
# table for stage totals
- $table = "Totals for all labels\n";
+ $table = "\n";
+ $table .= "Stage totals (top)\n";
$table .= "
";
$table .= " \n";
@@ -224,24 +218,21 @@
$table .= "
\n";
- print HTMLDOC $table;
+ print $htmlFile $table;
# print all label tables to page
foreach my $label (keys (%labelTables)) {
- print HTMLDOC "\n";
- print HTMLDOC "$label (top)\n";
+ print $htmlFile "\n";
+ print $htmlFile "$label (top)\n";
$self->{plotter}->createTimeSeries($label, undef, $self->{begin}, $self->{end}, 0, 0, 0);
- print HTMLDOC "![\"All](\"czarplot_linear_".$label."_all_stages_t.png\")
{day}\" />\n";
+ print $htmlFile "{day}\" />\n";
$self->{plotter}->createHistogram($label, $self->{begin}, $self->{end}, 0, 0, 0);
- print HTMLDOC "![\"All](\"czarplot_linear_".$label."_all_stages_h.png\")
{day}\" />\n";
-
- print HTMLDOC $labelTables{$label};
- }
-
-
- print HTMLDOC "
\n";
- print HTMLDOC "\n";
- print HTMLDOC "\n";
- close(HTMLDOC);
+ print $htmlFile "{day}\" />\n";
+
+ print $htmlFile $labelTables{$label};
+ }
+
+
+ $self->finishHtml();
}
@@ -254,12 +245,15 @@
my ($self) = @_;
- print HTMLDOC "Survey statistics\n";
- print HTMLDOC "
";
- print HTMLDOC " \n";
- print HTMLDOC " | Survey | \n";
- print HTMLDOC " Started burntool | \n";
- print HTMLDOC " Finished distribution | \n";
- print HTMLDOC " Time taken | \n";
- print HTMLDOC "
\n";
+ my $htmlFile = $self->{htmlFile};
+
+ print $htmlFile "\n";
+ print $htmlFile "Survey timings (top)\n";
+ print $htmlFile "
";
+ print $htmlFile " \n";
+ print $htmlFile " | Survey | \n";
+ print $htmlFile " Started burntool | \n";
+ print $htmlFile " Finished distribution | \n";
+ print $htmlFile " Time taken | \n";
+ print $htmlFile "
\n";
# OSS survey
@@ -307,5 +301,5 @@
$self->printSurveyDetails("All", $started, $finished, $timeTaken);
- print HTMLDOC "
\n";
+ print $htmlFile "
\n";
}
@@ -318,10 +312,12 @@
my ($self, $survey, $started, $finished, $timeTaken, $processed, $pending) = @_;
- print HTMLDOC "
\n";
- print HTMLDOC " | $survey | \n";
- printf (HTMLDOC " %s | \n", $started ? $started : "no");
- printf (HTMLDOC " %s | \n", $finished ? $finished : "no");
- printf (HTMLDOC " %s | \n", $timeTaken ? $timeTaken : "na");
- print HTMLDOC "
\n";
+ my $htmlFile = $self->{htmlFile};
+
+ print $htmlFile " \n";
+ print $htmlFile " | $survey | \n";
+ printf ($htmlFile " %s | \n", $started ? $started : "no");
+ printf ($htmlFile " %s | \n", $finished ? $finished : "no");
+ printf ($htmlFile " %s | \n", $timeTaken ? $timeTaken : "na");
+ print $htmlFile "
\n";
}
1;