Index: /trunk/ippMonitor/czartool/czarpoll.pl
===================================================================
--- /trunk/ippMonitor/czartool/czarpoll.pl (revision 33807)
+++ /trunk/ippMonitor/czartool/czarpoll.pl (revision 33808)
@@ -38,5 +38,4 @@
my @stages = (
- "burntool",
"chip",
"cam",
Index: /trunk/ippMonitor/czartool/czartool/CzarDb.pm
===================================================================
--- /trunk/ippMonitor/czartool/czartool/CzarDb.pm (revision 33807)
+++ /trunk/ippMonitor/czartool/czartool/CzarDb.pm (revision 33808)
@@ -9,5 +9,4 @@
my @stages = (
- "burntool",
"chip",
"cam",
Index: /trunk/ippMonitor/czartool/czartool/DayMetrics.pm
===================================================================
--- /trunk/ippMonitor/czartool/czartool/DayMetrics.pm (revision 33807)
+++ /trunk/ippMonitor/czartool/czartool/DayMetrics.pm (revision 33808)
@@ -40,5 +40,5 @@
$self->{begin} = "$yesterday " . $self->{config}->getMetricsStartTime();
$self->{end} = $self->{czarDb}->addInterval($self->{begin}, "1 DAY");
- $self->{burntoolEnd} = $self->{czarDb}->addInterval($self->{begin}, "12 HOUR");
+ $self->{chipEnd} = $self->{czarDb}->addInterval($self->{begin}, "12 HOUR");
# create path, dir and html file
@@ -67,8 +67,8 @@
my $htmlFile = $self->{htmlFile};
- # summit and burntool exposures
+ # summit and chip exposures
my $summitExposures = $self->{gpc1Db}->countScienceExposuresFromLastNight($self->{day});
- my $burntoolMetrics = new czartool::StageMetrics("burntool", "all_stdscience_labels", $self->{begin}, $self->{burntoolEnd});
- $self->{czarDb}->runAnalysis($burntoolMetrics);
+ my $chipMetrics = new czartool::StageMetrics("chip", "all_stdscience_labels", $self->{begin}, $self->{chipEnd});
+ $self->{czarDb}->runAnalysis($chipMetrics);
my $previousDay = $self->{czarDb}->subtractInterval($self->{day}, "1 DAY");
@@ -78,6 +78,6 @@
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 );
+ printf ( $htmlFile "%d exposures taken on summit last night, %d through chip today\n",
+ $summitExposures, $chipMetrics->getProcessed() ? $chipMetrics->getProcessed() : 0 );
print $htmlFile "\n";
print $htmlFile "\n";
@@ -98,5 +98,13 @@
my %labelTables;
- my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "staticsky", "diff", "dist");
+ my @stages = (
+ "chip",
+ "cam",
+ "fake",
+ "warp",
+ "stack",
+ "staticsky",
+ "diff",
+ "dist");
@@ -126,5 +134,5 @@
foreach my $stage ( @stages ){
- my $stageMetrics = new czartool::StageMetrics($stage, $label, $self->{begin}, ($stage eq "burntool") ? $self->{burntoolEnd} : $self->{end});
+ my $stageMetrics = new czartool::StageMetrics($stage, $label, $self->{begin}, ($stage eq "chip") ? $self->{chipEnd} : $self->{end});
if (!$self->{czarDb}->runAnalysis($stageMetrics)) {next;}
@@ -253,5 +261,5 @@
print $htmlFile " \n";
print $htmlFile " | Survey | \n";
- print $htmlFile " Started burntool | \n";
+ print $htmlFile " Started chip | \n";
print $htmlFile " Finished distribution | \n";
print $htmlFile " Time taken | \n";
@@ -260,5 +268,5 @@
# OSS survey
my ($started, $finished, $timeTaken) = undef;
- $self->{czarDb}->getDayTimings("OSS.nightlyscience", "burntool", "diff", $self->{begin}, \$started, \$finished, \$timeTaken);
+ $self->{czarDb}->getDayTimings("OSS.nightlyscience", "chip", "diff", $self->{begin}, \$started, \$finished, \$timeTaken);
$self->printSurveyDetails("OSS", $started, $finished, $timeTaken);
@@ -285,5 +293,5 @@
foreach $mdf (@mdfs) {
- if ($self->{czarDb}->getDayTimings($mdf, "burntool", "dist", $self->{begin}, \$started, \$finished, \$timeTaken)) {
+ if ($self->{czarDb}->getDayTimings($mdf, "chip", "dist", $self->{begin}, \$started, \$finished, \$timeTaken)) {
if ($started && $self->{czarDb}->isBefore($started, $earliest)) {$earliest = $started; $haveStart = 1;}
@@ -299,5 +307,5 @@
$self->printSurveyDetails("MDF", $earliest, $latest, $timeTaken);
- $self->{czarDb}->getDayTimings("all_stdscience_labels", "burntool", "dist", $self->{begin}, \$started, \$finished, \$timeTaken);
+ $self->{czarDb}->getDayTimings("all_stdscience_labels", "chip", "dist", $self->{begin}, \$started, \$finished, \$timeTaken);
$self->printSurveyDetails("All", $started, $finished, $timeTaken);
Index: /trunk/ippMonitor/czartool/czartool/Plotter.pm
===================================================================
--- /trunk/ippMonitor/czartool/czartool/Plotter.pm (revision 33807)
+++ /trunk/ippMonitor/czartool/czartool/Plotter.pm (revision 33808)
@@ -11,5 +11,4 @@
my @allStages = (
- "burntool",
"chip",
"cam",
Index: /trunk/ippMonitor/czartool/roboczar.pl
===================================================================
--- /trunk/ippMonitor/czartool/roboczar.pl (revision 33807)
+++ /trunk/ippMonitor/czartool/roboczar.pl (revision 33808)
@@ -21,5 +21,13 @@
my $czarDb = $config->getCzarDbInstance();
-my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "staticsky", "diff", "dist"); # TODO get from Pantasks
+my @stages = (
+ "chip",
+ "cam",
+ "fake",
+ "warp",
+ "stack",
+ "staticsky",
+ "diff",
+ "dist"); # TODO get from Pantasks
my @interestedServers = $config->getRoboczarInterestedServers();