Index: branches/eam_branches/ipp-20120405/ippMonitor/Makefile.in =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/Makefile.in (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/Makefile.in (revision 33949) @@ -47,4 +47,6 @@ $(DESTWWW)/ipp.dvodb.dat \ $(DESTWWW)/ipp.dvodb.php \ +$(DESTWWW)/ipp.czar.dat \ +$(DESTWWW)/ipp.czar.php \ $(DESTWWW)/phptest.php \ $(DESTWWW)/site.php \ @@ -222,6 +224,12 @@ $(DESTWWW)/minidvodbCopy.php \ $(DESTWWW)/minidvodbProcessed.php \ +$(DESTWWW)/mergedvodbRun.php \ +$(DESTWWW)/mergedvodbCopy.php \ +$(DESTWWW)/mergedvodbProcessed.php \ +$(DESTWWW)/dvodbStatus.php \ +$(DESTWWW)/dvodbFaulted.php \ $(DESTWWW)/addRunRun.php \ $(DESTWWW)/addRunProcessed.php \ +$(DESTWWW)/addRunSummary.php \ $(DESTWWW)/lapSequenceSummary.php \ $(DESTWWW)/lapRuns.php \ Index: branches/eam_branches/ipp-20120405/ippMonitor/czartool/czarpoll.pl =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/czartool/czarpoll.pl (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/czartool/czarpoll.pl (revision 33949) @@ -38,5 +38,4 @@ my @stages = ( - "burntool", "chip", "cam", @@ -44,9 +43,9 @@ "warp", "stack", + "staticsky", "diff", - "magic", - "magicDS", "dist", - "pub"); + "pub", + "chipbackground"); my @ippToPspsStages = ( Index: branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool.pl =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool.pl (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool.pl (revision 33949) @@ -32,5 +32,5 @@ my @publishingLabels = undef; -my @stages = ("chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist", "pub"); +my @stages = ("chip", "cam", "fake", "warp", "stack", "staticsky", "diff", "dist", "pub", "chipbackground"); promptPoll(); @@ -155,13 +155,25 @@ chomp($label); - - printf("\n+----------------------------------------------------------------------------------------------------------------------------------------------+\n"); - printf("| %32s |\n", $label); - printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n"); - printf("| state | chip | cam | fake | warp | stack | diff | magic | destreak | dist | publish |\n"); - printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n"); + my $stage; + + printf("\n| %32s \n", $label); + printf("+------------+"); + foreach $stage (@stages) { + print "--------------+" + } + printf("\n"); + printf("| state |"); + foreach $stage (@stages) { + + printf("%14s|", $stage) + } + printf("\n"); + printf("+------------+"); + foreach $stage (@stages) { + print "--------------+" + } + printf("\n"); my $state; - my $stage; my $i=0; foreach $state (@states) { @@ -172,5 +184,5 @@ foreach $stage (@stages) { - printf("| %10s ", getStateAndFaultsString($label, $state, $stage)); + printf("|%14s", getStateAndFaultsString($label, $state, $stage)); } @@ -179,5 +191,9 @@ } - printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n"); + printf("+------------+"); + foreach $stage (@stages) { + print "--------------+" + } + printf("\n"); } @@ -191,9 +207,13 @@ my ($state) = @_; #print time, $/; - printf("\n+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n"); - printf("| %10s (any faults are shown in parentheses) |\n", $state); - printf("+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------+\n"); - printf("| no | label | distributing? | publishing? | chip | cam | fake | warp | stack | diff | magic | destreak | dist | publish |\n"); - printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n"); + my $stage; + + printf("|\n"); + printf("+-----+----------------------------------+---------------+---------------+"); + foreach $stage (@stages) { + print "--------------+" + } + printf("\n"); + printf("| no | label | distributing? | publishing? |"); my $stdsLabel; @@ -202,6 +222,16 @@ my $distributing; my $publishing; - my $stage; my $i=1; + foreach $stage (@stages) { + + printf("%14s|", $stage) + } + printf("\n"); + printf("+-----+----------------------------------+---------------+---------------+"); + foreach $stage (@stages) { + print "--------------+" + } + printf("\n"); + foreach $stdsLabel (@stdscienceLabels) { @@ -225,5 +255,5 @@ foreach $stage (@stages) { - printf("| %10s ", getStateAndFaultsString($stdsLabel, $state, $stage)); + printf("|%14s", getStateAndFaultsString($stdsLabel, $state, $stage)); } @@ -232,5 +262,9 @@ } - printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n"); + printf("+-----+----------------------------------+---------------+---------------+"); + foreach $stage (@stages) { + print "--------------+" + } + printf("\n"); } Index: branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/CzarDb.pm =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/CzarDb.pm (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/CzarDb.pm (revision 33949) @@ -9,5 +9,4 @@ my @stages = ( - "burntool", "chip", "cam", @@ -16,8 +15,7 @@ "stack", "diff", - "magic", - "magicDS", "dist", - "pub"); # TODO put elsewhere + "pub", + "chipbackground"); # TODO put elsewhere my @ippToPspsStages = ( Index: branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/DayMetrics.pm =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/DayMetrics.pm (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/DayMetrics.pm (revision 33949) @@ -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,14 @@ my %labelTables; - my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist"); + my @stages = ( + "chip", + "cam", + "fake", + "warp", + "stack", + "staticsky", + "diff", + "dist", + "chipbackground"); @@ -126,5 +135,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 +262,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 +269,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 +294,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 +308,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: branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/Gpc1Db.pm =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/Gpc1Db.pm (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/Gpc1Db.pm (revision 33949) @@ -24,4 +24,5 @@ elsif ($stage eq "warp") {${$joinTable}="warpSkyfile";} elsif ($stage eq "stack") {${$joinTable}="stackSumSkyfile";} + elsif ($stage eq "staticsky") {${$id} = "sky_id"; ${$joinTable}="staticskyResult";} elsif ($stage eq "diff") {${$joinTable}="diffSkyfile";} elsif ($stage eq "magic") {${$joinTable}="magicNodeResult";} @@ -29,4 +30,5 @@ elsif ($stage eq "dist") {${$joinTable}="distComponent";} elsif ($stage eq "pub") {${$joinTable}="publishDone";} + elsif ($stage eq "chipbackground") {${$id}="chip_bg_id"; ${$joinTable}="chipBackgroundImfile";} else { @@ -51,4 +53,5 @@ elsif ($stage eq "warp" ) {return "warpRun";} elsif ($stage eq "stack" ) {return "stackRun";} + elsif ($stage eq "staticsky" ) {return "staticskyRun";} elsif ($stage eq "diff" ) {return "diffRun";} elsif ($stage eq "magic" ) {return "magicRun";} @@ -56,4 +59,5 @@ elsif ($stage eq "dist" ) {return "distRun";} elsif ($stage eq "pub" ) {return "publishRun";} + elsif ($stage eq "chipbackground" ) {return "chipBackgroundRun";} return "ERROR"; Index: branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/Plotter.pm =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/Plotter.pm (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/Plotter.pm (revision 33949) @@ -11,5 +11,4 @@ my @allStages = ( - "burntool", "chip", "cam", @@ -17,9 +16,9 @@ "warp", "stack", + "staticsky", "diff", - "magic", - "magicDS", "dist", - "pub"); + "pub", + "chipbackground"); my @allIppToPspsStages = ( Index: branches/eam_branches/ipp-20120405/ippMonitor/czartool/roboczar.pl =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/czartool/roboczar.pl (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/czartool/roboczar.pl (revision 33949) @@ -21,5 +21,14 @@ my $czarDb = $config->getCzarDbInstance(); -my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist"); # TODO get from Pantasks +my @stages = ( + "chip", + "cam", + "fake", + "warp", + "stack", + "staticsky", + "diff", + "dist", + "chipbackground"); # TODO get from Pantasks my @interestedServers = $config->getRoboczarInterestedServers(); Index: branches/eam_branches/ipp-20120405/ippMonitor/def/addRunRun.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/addRunRun.d (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/addRunRun.d (revision 33949) @@ -9,19 +9,18 @@ # field size format name show link to extras -FIELD distinct(addRun.add_id), 5, %d, add ID +FIELD addRun.add_id, 5, %d, addID FIELD addRun.stage, 5, %s, stage -FIELD addRun.stage_id, 5, %d, stage ID -FIELD addRun.add_id, 5, %d, add ID +FIELD addRun.stage_id, 5, %d, stageID +FIELD addRun.stage_extra1, 5, %d, stageExtra1 +#FIELD addRun.add_id, 5, %d, addID FIELD addRun.state, 5, %s, state -FIELD addRun.workdir, 5, %s, workdir -FIELD addRun.reduction, 5, %s, reduction +FIELD addRun.workdir, 5, %s, workdir +FIELD addRun.reduction, 5, %s, reduction FIELD addRun.label, 5, %s, label -FIELD addRun.data_group, 5, %s, data_group +FIELD addRun.data_group, 5, %s, data_group FIELD addRun.dvodb, 5, %s, dvodb -FIELD addRun.note, 5, %s, note -FIELD addRun.image_only, 5, %d, image_only -FIELD addRun.minidvodb, 5, %d, minidvodb -FIELD addRun.minidvodb_group, 5, %s, minidvodb_group -FIELD addRun.minidvodb_name, 5, %s, minidvodb_name - - +FIELD addRun.note, 5, %s, note +FIELD addRun.image_only, 5, %d, image_only +FIELD addRun.minidvodb, 5, %d, minidvodb +FIELD addRun.minidvodb_group, 5, %s, minidvodb_group +FIELD addRun.minidvodb_name, 5, %s, minidvodb_name Index: branches/eam_branches/ipp-20120405/ippMonitor/def/addRunSummary.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/addRunSummary.d (revision 33949) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/addRunSummary.d (revision 33949) @@ -0,0 +1,26 @@ +TABLE addRun +#left join addProcessedExp using (add_id) +TITLE dvodb Status +FILE addRunSummary.php +MENU ipp.dvodb.dat + + +#WHERE (minidvodbProcessed.fault > 0 or mergedvodbProcessed.fault > 0) +WHERE add_id > 500000 + +# field width format name show link to extras +FIELD count(addRun.add_id), 5, %d, count(add_id) +FIELD addRun.dvodb, 10, %s, dvodb +FIELD addRun.minidvodb_group, 10, %s, minidvodb_group +FIELD addRun.stage, 5, %s , stage +FIELD addRun.state, 5, %s, state +#FIELD addProcessedExp.fault, 5, %d, fault + +MODE summary +#GROUP BY minidvodbRun.minidvodb_id +#GROUP rawExp.exp_id +GROUP dvodb +GROUP stage +GROUP state +#GROUP fault +ORDER add_id Index: branches/eam_branches/ipp-20120405/ippMonitor/def/dvodbFaulted.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/dvodbFaulted.d (revision 33949) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/dvodbFaulted.d (revision 33949) @@ -0,0 +1,25 @@ +TABLE minidvodbRun LEFT JOIN minidvodbProcessed using(minidvodb_id) LEFT JOIN mergedvodbRun using(minidvodb_id) LEFT JOIN mergedvodbProcessed using(merge_id) +TITLE dvodb Status: either mini or merge is faulted +FILE dvodbFaulted.php +MENU ipp.dvodb.dat + + +WHERE (minidvodbProcessed.fault > 0 or mergedvodbProcessed.fault > 0) + +#UNRESTRICTED WHERE minidvodbRun.creation_date >= DATE_ADD(DATE (NOW()), INTERVAL -30 DAY) + +# field width format name show link to extras +FIELD minidvodbRun.minidvodb_id, 5, %d, minidvodb_id +FIELD minidvodbRun.minidvodb_name, 5, %s, minidvodb_name +FIELD minidvodbRun.state, 5, %s, minidvodb_state +FIELD minidvodbProcessed.fault, 5, %d, minidvodb fault +FIELD mergedvodbRun.merge_id, 5, %d, merge_id +FIELD mergedvodbRun.mergedvodb, 5, %s, mergedvodb +FIELD mergedvodbRun.state, 5, %s, mergedvodb_state +FIELD mergedvodbProcessed.fault, 5, %d, mergedvodb fault + + + +#MODE summary +#GROUP BY minidvodbRun.minidvodb_id +#GROUP rawExp.exp_id Index: branches/eam_branches/ipp-20120405/ippMonitor/def/dvodbStatus.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/dvodbStatus.d (revision 33949) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/dvodbStatus.d (revision 33949) @@ -0,0 +1,25 @@ +TABLE minidvodbRun LEFT JOIN minidvodbProcessed using(minidvodb_id) LEFT JOIN mergedvodbRun using(minidvodb_id) LEFT JOIN mergedvodbProcessed using(merge_id) +TITLE dvodb Status +FILE dvodbStatus.php +MENU ipp.dvodb.dat + + +#WHERE (minidvodbProcessed.fault > 0 or mergedvodbProcessed.fault > 0) + +#UNRESTRICTED WHERE minidvodbRun.creation_date >= DATE_ADD(DATE (NOW()), INTERVAL -30 DAY) + +# field width format name show link to extras +FIELD minidvodbRun.minidvodb_id, 5, %d, minidvodb_id +FIELD minidvodbRun.minidvodb_name, 5, %s, minidvodb_name +FIELD minidvodbRun.state, 5, %s, minidvodb_state +FIELD minidvodbProcessed.fault, 5, %d, minidvodb fault +FIELD mergedvodbRun.merge_id, 5, %d, merge_id +FIELD mergedvodbRun.mergedvodb, 5, %s, mergedvodb +FIELD mergedvodbRun.state, 5, %s, mergedvodb_state +FIELD mergedvodbProcessed.fault, 5, %d, mergedvodb fault + + + +#MODE summary +#GROUP BY minidvodbRun.minidvodb_id +#GROUP rawExp.exp_id Index: branches/eam_branches/ipp-20120405/ippMonitor/def/exposureStatus.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/exposureStatus.d (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/exposureStatus.d (revision 33949) @@ -2,5 +2,5 @@ TITLE Exposures Status FILE exposureStatus.php -MENU ipp.imfiles.dat +MENU ipp.czar.dat WHERE object != 'ENGINEERING' Index: branches/eam_branches/ipp-20120405/ippMonitor/def/gpc1MysqlProcessList.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/gpc1MysqlProcessList.d (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/gpc1MysqlProcessList.d (revision 33949) @@ -2,5 +2,5 @@ TITLE GPC 1 MySql Process List FILE gpc1MysqlProcessList.php -MENU ipp.imfiles.dat +MENU ipp.czar.dat FIELD ID, 5, %d, Process ID Index: branches/eam_branches/ipp-20120405/ippMonitor/def/maskStats.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/maskStats.d (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/maskStats.d (revision 33949) @@ -2,5 +2,5 @@ TITLE Mask Stats FILE maskStats.php -MENU ipp.imfiles.dat +MENU ipp.czar.dat WHERE rawExp.exp_id = chipRun.exp_id Index: branches/eam_branches/ipp-20120405/ippMonitor/def/mergedvodbCopy.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/mergedvodbCopy.d (revision 33949) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/mergedvodbCopy.d (revision 33949) @@ -0,0 +1,19 @@ +TABLE mergedvodbCopy +TITLE mergedvodb Copies +FILE mergedvodbCopy.php +MENU ipp.dvodb.dat + +# the following WHERE clauses are added to all queries joined by AND + +#WHERE mergedvodbcopy_id >= 0 + +# field size format name show link to extras +FIELD mergedvodbCopy.mergedvodbcopy_id, 5, %d, merge Copy ID +FIELD mergedvodbCopy.merge_id, 5, %d, merge ID +FIELD mergedvodbCopy.mergedvodb_rsync_path, 25, %s, rsync path +FIELD mergedvodbCopy.destination_host, 5, %s, destinatin host +FIELD mergedvodbCopy.fault, 5, %s, Fault +FIELD mergedvodbCopy.state, 5, %s, State +FIELD mergedvodbCopy.epoch, 5, %T, Epoch +FIELD mergedvodbCopy.dtime, 5, %d, dtime + Index: branches/eam_branches/ipp-20120405/ippMonitor/def/mergedvodbProcessed.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/mergedvodbProcessed.d (revision 33949) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/mergedvodbProcessed.d (revision 33949) @@ -0,0 +1,21 @@ +TABLE mergedvodbRun, mergedvodbProcessed +TITLE Processed mergedvodbs +FILE mergedvodbProcessed.php +MENU ipp.dvodb.dat + +# the following WHERE clauses are added to all queries joined by AND + +WHERE mergedvodbRun.merge_id = mergedvodbProcessed.merge_id + +# field size format name show link to extras +FIELD mergedvodbRun.merge_id, 5, %d, merge ID +FIELD mergedvodbRun.minidvodb_id, 5, %d, minidvodb_id +FIELD mergedvodbRun.mergedvodb, 5, %s, mergedvodb +FIELD mergedvodbProcessed.merge_order, 5, %d, merge order +FIELD mergedvodbProcessed.dtime_verify, 5, %d, verify time +FIELD mergedvodbProcessed.dtime_merge, 5, %d, merge time +FIELD mergedvodbProcessed.dtime_script, 5, %d, script time +FIELD state, 5, %s, State +FIELD mergedvodbProcessed.fault, 5, %d, Fault +FIELD epoch, 5, %T, epoch + Index: branches/eam_branches/ipp-20120405/ippMonitor/def/mergedvodbRun.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/mergedvodbRun.d (revision 33949) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/mergedvodbRun.d (revision 33949) @@ -0,0 +1,21 @@ +TABLE mergedvodbRun, minidvodbRun +TITLE mergedvodb Runs +FILE mergedvodbRun.php +MENU ipp.dvodb.dat + +# the following WHERE clauses are added to all queries joined by AND + +WHERE merge_id >= 0 +WHERE mergedvodbRun.minidvodb_id = minidvodbRun.minidvodb_id + +# field size format name show link to extras +FIELD mergedvodbRun.merge_id, 5, %d, merge ID +FIELD mergedvodbRun.minidvodb_id, 5, %d, minidvodb ID +FIELD minidvodbRun.minidvodb_name, 10, %s, minidvodb_name +FIELD mergedvodbRun.mergedvodb, 5, %s, mergedvodb +###FIELD mergedvodbRun.mergedvodb_group, 5, %s, mergedvodb_group +FIELD mergedvodbRun.mergedvodb_path, 25, %s, mergedvodb_path +#FIELD mergedvodbRun.mergedvodb_path, 25, %s, mergedvodb_path +FIELD mergedvodbRun.state, 5, %s, State +FIELD mergedvodbRun.creation_date, 5, %T, epoch + Index: branches/eam_branches/ipp-20120405/ippMonitor/def/minidvodbProcessed.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/minidvodbProcessed.d (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/minidvodbProcessed.d (revision 33949) @@ -9,13 +9,10 @@ # field size format name show link to extras -FIELD distinct(minidvodbRun.minidvodb_id), 5, %d, Minidvodb ID - +FIELD minidvodbRun.minidvodb_id, 5, %d, Minidvodb ID FIELD minidvodbRun.minidvodb_name, 5, %s, minidvodb_name FIELD minidvodbRun.minidvodb_group, 5, %s, minidvodb_group -FIELD minidvodbProcessed.merge_order, 5, %d, Merge Order FIELD minidvodbProcessed.dtime_resort, 5, %d, resort time FIELD minidvodbProcessed.dtime_relphot, 5, %d, relphot time -FIELD minidvodbProcessed.dtime_merge, 5, %d, dvomerge time -FIELD minidvodbProcessed.mergedvodb_path, 25, %s, mergedvodb_path +FIELD minidvodbProcessed.dtime_script, 5, %d, script time FIELD state, 5, %s, State FIELD minidvodbProcessed.fault, 5, %d, Fault Index: branches/eam_branches/ipp-20120405/ippMonitor/def/minidvodbRun.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/minidvodbRun.d (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/minidvodbRun.d (revision 33949) @@ -9,9 +9,9 @@ # field size format name show link to extras -FIELD distinct(minidvodbRun.minidvodb_id), 5, %d, Minidvodb ID +FIELD minidvodbRun.minidvodb_id, 5, %d, Minidvodb ID FIELD minidvodbRun.minidvodb_name, 5, %s, minidvodb_name FIELD minidvodbRun.minidvodb_group, 5, %s, minidvodb_group FIELD minidvodbRun.minidvodb_path, 25, %s, minidvodb_path -FIELD minidvodbRun.mergedvodb_path, 25, %s, mergedvodb_path +#FIELD minidvodbRun.mergedvodb_path, 25, %s, mergedvodb_path FIELD state, 5, %s, State FIELD creation_date, 5, %T, epoch Index: branches/eam_branches/ipp-20120405/ippMonitor/def/mopsStatus.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/mopsStatus.d (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/mopsStatus.d (revision 33949) @@ -2,5 +2,5 @@ TITLE MOPS Status FILE mopsStatus.php -MENU ipp.imfiles.dat +MENU ipp.czar.dat #WHERE rawExp.obs_mode!='ENGINEERING' Index: branches/eam_branches/ipp-20120405/ippMonitor/def/warpProcessedSkyfiles_Images.d =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/def/warpProcessedSkyfiles_Images.d (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/def/warpProcessedSkyfiles_Images.d (revision 33949) @@ -1,5 +1,5 @@ TABLE rawExp JOIN chipRun USING(exp_id) JOIN camRun USING(chip_id) JOIN fakeRun USING(cam_id) JOIN warpRun USING(fake_id) JOIN warpSkyfile USING(warp_id) TITLE Warp Processed Skyfiles -FILE warpProcessedSkyfiles.php +FILE warpProcessedSkyfiles_Images.php MENU ipp.science.dat Index: branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_ipptopsps.php =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_ipptopsps.php (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_ipptopsps.php (revision 33949) @@ -23,5 +23,5 @@ if ($ID['menu']) {$myMenu = $ID['menu'];} -else {$myMenu = "ipp.imfiles.dat";} +else {$myMenu = "ipp.czar.dat";} menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']); @@ -78,5 +78,5 @@ $debug = 0; -$table = "\n"; +$table = "
\n"; Index: branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_labels.php =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_labels.php (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_labels.php (revision 33949) @@ -23,10 +23,9 @@ if ($ID['menu']) {$myMenu = $ID['menu'];} -else {$myMenu = "ipp.imfiles.dat";} +else {$myMenu = "ipp.czar.dat";} menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']); $stages=array( - "burntool", "chip", "cam", @@ -34,9 +33,9 @@ "warp", "stack", + "staticsky", "diff", - "magic", - "magicDS", "dist", - "pub"); + "pub", + "chipbackground"); $servers=array( @@ -92,5 +91,5 @@ $debug = 0; -$table = "
\n"; +$table = "
\n"; $labels = getLabels($czardb, $selectedMode); @@ -441,8 +440,4 @@ $anyFaults = false; - $link = $defaultlink; - getStateAndFaults($db, $thisLabel, $selectedState, "burntool", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); - $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults); @@ -465,4 +460,8 @@ createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); + $link = $defaultlink; + getStateAndFaults($db, $thisLabel, $selectedState, "staticsky", $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); + $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "diff", $str, $anyFaults); @@ -470,12 +469,4 @@ $link = $defaultlink; - getStateAndFaults($db, $thisLabel, $selectedState, "magic", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null); - - $link = $defaultlink; - getStateAndFaults($db, $thisLabel, $selectedState, "magicDS", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null); - - $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "dist", $str, $anyFaults); createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null); @@ -485,4 +476,8 @@ createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$publishing) ? "gray" : null); + $link = $defaultlink; + getStateAndFaults($db, $thisLabel, $selectedState, "chipbackground", $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); + echo "\n"; } @@ -492,29 +487,11 @@ createFormattedTableCell(($selectedLabel != "all"), $link, "All labels", 0, null); - createFormattedTableCell(0, null, "Reverting?", 0, "$columnHeaderColor"); - foreach ($stages as &$stage) { - if ($stage == "burntool") continue; $reverting = getRevertStatus($db, $stage); - #$link = - # "czartool_labels.php?pass=".$pass - # ."&proj=".$proj - # ."&mode=" .$selectedMode - # ."&label=".$selectedLabel - # ."&stage=".$selectedStage - # ."&plottype=".$plotType - # ."&revertstage=".$stage - # ."&revertmode="; -# - #if(!$reverting) {$label = "Start";$link = $link . "on";} - #if($reverting) {$label = "Stop";$link = $link . "off";} - if(!$reverting) {$label = "no";} - if($reverting) {$label = "yes";} + if(!$reverting) {$label = "";} + if($reverting) {$label = "reverting";} unset($reverting); - #createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor"); createFormattedTableCell(0, null, $label, 0, "$columnHeaderColor"); - #echo ""; - } Index: branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.czar.dat =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.czar.dat (revision 33949) +++ branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.czar.dat (revision 33949) @@ -0,0 +1,13 @@ +input | ipp.menu.dat + +menutop | menutop | plain |   | + +menulink | menuselect | link | czartool - standard | czartool_labels.php +menulink | menuselect | link | czartool - ipptopsps | czartool_ipptopsps.php +menulink | menuselect | link | mask stats | maskStats.php +menulink | menuselect | link | night summary | nightSummary.php +menutop | menutop | plain |   | +menulink | menuselect | link | Exposures Status | exposureStatus.php +menulink | menuselect | link | MOPS Exposures Status | mopsStatus.php +menulink | menuselect | link | GPC1 MySql ProcessList | gpc1MysqlProcessList.php + Index: branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.czar.php =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.czar.php (revision 33949) +++ branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.czar.php (revision 33949) @@ -0,0 +1,17 @@ +\n"; + +menu_end(); + +?> Index: branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.dvodb.dat =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.dvodb.dat (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.dvodb.dat (revision 33949) @@ -9,5 +9,16 @@ menulink | menuselect | link | minidvodbRun | minidvodbRun.php -menulink | menuselect | link | minidvodbProcessed | minidvodbProcessed.php +menulink | menuselect | link | minidvodbProcessed | minidvodbProcessed.php menulink | menuselect | link | minidvodbCopy | minidvodbCopy.php +menutop | menutop | plain |   | + +menulink | menuselect | link | mergedvodbRun | mergedvodbRun.php +menulink | menuselect | link | mergedvodbProcessed | mergedvodbProcessed.php +menulink | menuselect | link | mergedvodbCopy | mergedvodbCopy.php + +menutop | menutop | plain |   | + +menulink | menuselect | link | dvodbStatus | dvodbStatus.php +menulink | menuselect | link | dvodbFaulted | dvodbFaulted.php +menulink | menuselect | link | addRun Summary | addRunSummary.php Index: branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.menu.dat =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.menu.dat (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.menu.dat (revision 33949) @@ -27,3 +27,4 @@ menutop | menutop | link | Calibration | ipp.cal.php menutop | menutop | link | Plots | ipp.plots.php +menutop | menutop | link | Czar | ipp.czar.php menutop | menutop | link | Admin and Debug | ipp.imfiles.php Index: branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.science.dat =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.science.dat (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/raw/ipp.science.dat (revision 33949) @@ -38,4 +38,5 @@ menulink | menuselect | link | Warp Skyfile Inputs | warpStageSkyfileInputs.php menulink | menuselect | link | Warp Processed Skyfiles | warpProcessedSkyfiles.php +#menulink | menuselect | link | Warp Processed Skyfiles w/ Images | warpProcessedSkyfiles_images.php menulink | menuselect | link | Warp Failed Skyfiles | warpFailedSkyfiles.php Index: branches/eam_branches/ipp-20120405/ippMonitor/raw/nightSummary.php =================================================================== --- branches/eam_branches/ipp-20120405/ippMonitor/raw/nightSummary.php (revision 33724) +++ branches/eam_branches/ipp-20120405/ippMonitor/raw/nightSummary.php (revision 33949) @@ -52,5 +52,5 @@ $myMenu = $ID['menu']; } else { - $myMenu = "ipp.imfiles.dat"; + $myMenu = "ipp.czar.dat"; }
$label