Changeset 33808
- Timestamp:
- Apr 19, 2012, 9:39:41 AM (14 years ago)
- Location:
- trunk/ippMonitor/czartool
- Files:
-
- 5 edited
-
czarpoll.pl (modified) (1 diff)
-
czartool/CzarDb.pm (modified) (1 diff)
-
czartool/DayMetrics.pm (modified) (9 diffs)
-
czartool/Plotter.pm (modified) (1 diff)
-
roboczar.pl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippMonitor/czartool/czarpoll.pl
r33805 r33808 38 38 39 39 my @stages = ( 40 "burntool",41 40 "chip", 42 41 "cam", -
trunk/ippMonitor/czartool/czartool/CzarDb.pm
r33800 r33808 9 9 10 10 my @stages = ( 11 "burntool",12 11 "chip", 13 12 "cam", -
trunk/ippMonitor/czartool/czartool/DayMetrics.pm
r33805 r33808 40 40 $self->{begin} = "$yesterday " . $self->{config}->getMetricsStartTime(); 41 41 $self->{end} = $self->{czarDb}->addInterval($self->{begin}, "1 DAY"); 42 $self->{ burntoolEnd} = $self->{czarDb}->addInterval($self->{begin}, "12 HOUR");42 $self->{chipEnd} = $self->{czarDb}->addInterval($self->{begin}, "12 HOUR"); 43 43 44 44 # create path, dir and html file … … 67 67 my $htmlFile = $self->{htmlFile}; 68 68 69 # summit and burntoolexposures69 # summit and chip exposures 70 70 my $summitExposures = $self->{gpc1Db}->countScienceExposuresFromLastNight($self->{day}); 71 my $ burntoolMetrics = new czartool::StageMetrics("burntool", "all_stdscience_labels", $self->{begin}, $self->{burntoolEnd});72 $self->{czarDb}->runAnalysis($ burntoolMetrics);71 my $chipMetrics = new czartool::StageMetrics("chip", "all_stdscience_labels", $self->{begin}, $self->{chipEnd}); 72 $self->{czarDb}->runAnalysis($chipMetrics); 73 73 74 74 my $previousDay = $self->{czarDb}->subtractInterval($self->{day}, "1 DAY"); … … 78 78 print $htmlFile "<a href=\"../$previousDay/index.html\"> \< previous day</a> | <a href=\"../index.html\">all</a> | <a href=\"../$nextDay/index.html\">next day \></a><br>\n"; 79 79 print $htmlFile "Measured from $self->{begin} to $self->{end} HST<br>\n"; 80 printf ( $htmlFile "%d exposures taken on summit last night, %d through burntooltoday</h5>\n",81 $summitExposures, $ burntoolMetrics->getProcessed() ? $burntoolMetrics->getProcessed() : 0 );80 printf ( $htmlFile "%d exposures taken on summit last night, %d through chip today</h5>\n", 81 $summitExposures, $chipMetrics->getProcessed() ? $chipMetrics->getProcessed() : 0 ); 82 82 print $htmlFile "</head>\n"; 83 83 print $htmlFile "<body>\n"; … … 98 98 my %labelTables; 99 99 100 my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "staticsky", "diff", "dist"); 100 my @stages = ( 101 "chip", 102 "cam", 103 "fake", 104 "warp", 105 "stack", 106 "staticsky", 107 "diff", 108 "dist"); 101 109 102 110 … … 126 134 foreach my $stage ( @stages ){ 127 135 128 my $stageMetrics = new czartool::StageMetrics($stage, $label, $self->{begin}, ($stage eq " burntool") ? $self->{burntoolEnd} : $self->{end});136 my $stageMetrics = new czartool::StageMetrics($stage, $label, $self->{begin}, ($stage eq "chip") ? $self->{chipEnd} : $self->{end}); 129 137 if (!$self->{czarDb}->runAnalysis($stageMetrics)) {next;} 130 138 … … 253 261 print $htmlFile " <tr>\n"; 254 262 print $htmlFile " <th>Survey</th>\n"; 255 print $htmlFile " <th>Started burntool</th>\n";263 print $htmlFile " <th>Started chip</th>\n"; 256 264 print $htmlFile " <th>Finished distribution</th>\n"; 257 265 print $htmlFile " <th>Time taken</th>\n"; … … 260 268 # OSS survey 261 269 my ($started, $finished, $timeTaken) = undef; 262 $self->{czarDb}->getDayTimings("OSS.nightlyscience", " burntool", "diff", $self->{begin}, \$started, \$finished, \$timeTaken);270 $self->{czarDb}->getDayTimings("OSS.nightlyscience", "chip", "diff", $self->{begin}, \$started, \$finished, \$timeTaken); 263 271 $self->printSurveyDetails("OSS", $started, $finished, $timeTaken); 264 272 … … 285 293 foreach $mdf (@mdfs) { 286 294 287 if ($self->{czarDb}->getDayTimings($mdf, " burntool", "dist", $self->{begin}, \$started, \$finished, \$timeTaken)) {295 if ($self->{czarDb}->getDayTimings($mdf, "chip", "dist", $self->{begin}, \$started, \$finished, \$timeTaken)) { 288 296 289 297 if ($started && $self->{czarDb}->isBefore($started, $earliest)) {$earliest = $started; $haveStart = 1;} … … 299 307 $self->printSurveyDetails("MDF", $earliest, $latest, $timeTaken); 300 308 301 $self->{czarDb}->getDayTimings("all_stdscience_labels", " burntool", "dist", $self->{begin}, \$started, \$finished, \$timeTaken);309 $self->{czarDb}->getDayTimings("all_stdscience_labels", "chip", "dist", $self->{begin}, \$started, \$finished, \$timeTaken); 302 310 $self->printSurveyDetails("All", $started, $finished, $timeTaken); 303 311 -
trunk/ippMonitor/czartool/czartool/Plotter.pm
r33805 r33808 11 11 12 12 my @allStages = ( 13 "burntool",14 13 "chip", 15 14 "cam", -
trunk/ippMonitor/czartool/roboczar.pl
r33805 r33808 21 21 my $czarDb = $config->getCzarDbInstance(); 22 22 23 my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "staticsky", "diff", "dist"); # TODO get from Pantasks 23 my @stages = ( 24 "chip", 25 "cam", 26 "fake", 27 "warp", 28 "stack", 29 "staticsky", 30 "diff", 31 "dist"); # TODO get from Pantasks 24 32 25 33 my @interestedServers = $config->getRoboczarInterestedServers();
Note:
See TracChangeset
for help on using the changeset viewer.
