Index: trunk/ippMonitor/Makefile.in =================================================================== --- trunk/ippMonitor/Makefile.in (revision 37930) +++ trunk/ippMonitor/Makefile.in (revision 37983) @@ -217,4 +217,6 @@ $(DESTWWW)/simplePlotStaticskyImage.php \ $(DESTWWW)/simplePlotSkycalImage.php \ +$(DESTWWW)/simplePlotDiffImage.php \ +$(DESTWWW)/subsetPlotDiffImage.php \ $(DESTWWW)/histogramBackgroundImage.php \ $(DESTWWW)/histogramCamProcessedExpImage.php \ Index: trunk/ippMonitor/czartool/czartool.pl =================================================================== --- trunk/ippMonitor/czartool/czartool.pl (revision 37930) +++ trunk/ippMonitor/czartool/czartool.pl (revision 37983) @@ -55,5 +55,6 @@ @stdscienceLabels = @{$pantasks->getLabels("stdscience")}; @distributionLabels = @{$pantasks->getLabels("distribution")}; - @publishingLabels = @{$pantasks->getLabels("publishing")}; + # @publishingLabels = @{$pantasks->getLabels("publishing")}; + @publishingLabels = @stdscienceLabels; checkAllLabels("new"); printInstructions(); @@ -109,5 +110,6 @@ sub checkServers { - my @servers = ("addstar", "cleanup", "detrend", "distribution", "pstamp", "update", "publishing", "registration", "replication", "stdscience", "summitcopy"); + # my @servers = ("addstar", "cleanup", "detrend", "distribution", "pstamp", "update", "publishing", "registration", "replication", "stdscience", "summitcopy"); + my @servers = ("cleanup", "detrend", "distribution", "pstamp", "registration", "replication", "stdscience", "summitcopy"); printf("\n+-----------------------------------------------+\n"); printf("| Servers |\n"); Index: trunk/ippMonitor/czartool/czartool/CzarDb.pm =================================================================== --- trunk/ippMonitor/czartool/czartool/CzarDb.pm (revision 37930) +++ trunk/ippMonitor/czartool/czartool/CzarDb.pm (revision 37983) @@ -272,4 +272,20 @@ my $size = scalar @{$labels}; if ($size < 1) { return; } +# CZW: 2014-09-12 edit to force in lanl labels + if ($server eq 'stdscience') { + push @{$labels}, 'LAP.PV3.20140730.final'; +# push @{$labels}, 'LAP.PV3.20140730.local'; +# push @{$labels}, 'LAP.PV3.20140730.ipp'; +# push @{$labels}, 'LAP.PV3.20140730.ipp.local'; +# push @{$labels}, 'LAP.PV3.20140730.restack'; +# push @{$labels}, 'LAP.PV3.20140730.bigmem'; +# push @{$labels}, 'LAP.PV3.20140730.sky01'; + push @{$labels}, 'LAP.PV3.20140730.sky01.remote'; + push @{$labels}, 'LAP.PV3.20140730.diff01'; + push @{$labels}, 'LAP.PV3.20140730.diff01.left'; + push @{$labels}, 'LAP.PV3W.20150312'; +# push @{$labels}, 'SAS.20141118'; + } + my $query = $self->{_db}->prepare(< gpc1 - scidbs1 + scidbm ippuser ippuser @@ -47,5 +47,5 @@ 20 MINUTE - stdscience distribution summitcopy registration stack pstamp + stdscience distribution summitcopy registration pstamp Index: trunk/ippMonitor/def/chipProcessedImfile_failure.d =================================================================== --- trunk/ippMonitor/def/chipProcessedImfile_failure.d (revision 37930) +++ trunk/ippMonitor/def/chipProcessedImfile_failure.d (revision 37983) @@ -17,4 +17,5 @@ ARGS ARG3 chipProcessedImfile.class_id=$chipProcessedImfile.class_id ARGS ARG3 camera=$rawExp.camera +ARGS ARG3 state=$chipRun.state ARGS ARG3 basename=$chipProcessedImfile.path_base ARGS ARG3 class=$chipProcessedImfile.class_id @@ -28,5 +29,5 @@ FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile_failure.php, ARG2 -FIELD chipRun.state, 7, %s, State, value, chipProcessedImfile_failure.php, ARG3 +FIELD chipRun.state, 8, %s, State, value, chipProcessedImfile_failure.php, ARG3 FIELD chipRun.label, 7, %s, Label FIELD chipRun.data_group, 7, %s, data grp Index: trunk/ippMonitor/def/failedCamProcessedExp.d =================================================================== --- trunk/ippMonitor/def/failedCamProcessedExp.d (revision 37930) +++ trunk/ippMonitor/def/failedCamProcessedExp.d (revision 37983) @@ -17,4 +17,5 @@ ARGS ARG4 camRun.cam_id=$camRun.cam_id ARGS ARG4 camera=$rawExp.camera +ARGS ARG4 state=$camRun.state ARGS ARG4 basename=$camProcessedExp.path_base @@ -35,4 +36,5 @@ FIELD camProcessedExp.path_base, 5, %s, path_base, none FIELD rawExp.exp_id, 5, %s, Exp ID, none +FIELD rawExp.camera, 5, %s, Camera, none Index: trunk/ippMonitor/def/failedChipProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/failedChipProcessedImfile.d (revision 37930) +++ trunk/ippMonitor/def/failedChipProcessedImfile.d (revision 37983) @@ -18,4 +18,5 @@ ARGS ARG3 camera=$rawExp.camera ARGS ARG3 basename=$chipProcessedImfile.path_base +ARGS ARG3 state=$chipRun.state ARGS ARG3 class=$chipProcessedImfile.class_id @@ -32,4 +33,6 @@ FIELD chipRun.dist_group, 7, %s, dist grp FIELD chipProcessedImfile.fault, 2, %d, Fault +FIELD chipProcessedImfile.path_base, 5, %s, path_base, none +FIELD rawExp.camera, 10, %s, Camera, none FIELD *, 50, %s, Revert Command, op=OP1 @@ -47,5 +50,4 @@ # FIELD chipProcessedImfile.n_stars, 5, %d, Nstars # FIELD chipProcessedImfile.fwhm_major, 5, %.2f, FHWM -# FIELD chipProcessedImfile.path_base, 5, %s, path_base, none # FIELD rawExp.comment, 65, %s, Comment Index: trunk/ippMonitor/def/failedWarpSkyfiles.d =================================================================== --- trunk/ippMonitor/def/failedWarpSkyfiles.d (revision 37930) +++ trunk/ippMonitor/def/failedWarpSkyfiles.d (revision 37983) @@ -21,4 +21,5 @@ ARGS ARG7 warpSkyfile.skycell_id=$warpSkyfile.skycell_id ARGS ARG7 camera=$rawExp.camera +ARGS ARG7 state=$warpRun.state ARGS ARG7 basename=$warpSkyfile.path_base @@ -32,8 +33,9 @@ FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 FIELD warpRun.warp_id, 7, %d, Warp ID, value, warpStageExp.php, ARG5 -FIELD warpSkyfile.skycell_id, 10, %s, Skycell ID, value, warpFailedSkyfiles.php, ARG6 -FIELD warpRun.state, 7, %s, State, value, warpFailedSkyfiles.php, ARG7 +FIELD warpSkyfile.skycell_id, 10, %s, Skycell ID, value, warpFailedSkyfiles.php, ARG6 +FIELD warpRun.state, 8, %s, State, value, warpFailedSkyfiles.php, ARG7 FIELD warpRun.label, 7, %s, Label FIELD warpSkyfile.fault, 2, %d, Fault +FIELD rawExp.camera, 2, %s, camera, none FIELD *, 50, %s, Revert Command, op=OP1 Index: trunk/ippMonitor/def/simplePlotChipQueue.d =================================================================== --- trunk/ippMonitor/def/simplePlotChipQueue.d (revision 37983) +++ trunk/ippMonitor/def/simplePlotChipQueue.d (revision 37983) @@ -0,0 +1,29 @@ +TABLE chipRun, rawExp +TITLE New sky plot - chip +FILE simplePlotChipQueue.php +MENU ipp.plots.dat + +WHERE chipRun.exp_id = rawExp.exp_id + +# field size format name show link to extras +FIELD rawExp.exp_name, 5, %s, Exp Name, restrict +FIELD rawExp.exp_id, 5, %d, Exp ID, restrict +FIELD rawExp.telescope, 10, %s, Telescope, restrict +FIELD rawExp.camera, 10, %s, Camera, restrict +FIELD rawExp.dateobs, 19, %T, Date/Time, restrict +FIELD chipRun.label, 10, %s, Label, restrict +FIELD chipRun.state, 10, %s, State, restrict +FIELD rawExp.ra, 8, %C, RA, restrict +FIELD rawExp.decl, 8, %C, DEC, restrict +FIELD rawExp.comment, 65, %s, Comment, restrict +FIELD rawExp.object, 8, %s, Object, restrict +FIELD rawExp.filter, 10, %s, FILTER, restrict +FIELD rawExp.exp_time, 5, %.2f, exp_time, restrict +FIELD rawExp.airmass, 5, %.4f, airmass, restrict +FIELD rawExp.bg, 5, %.2f, backgnd, restrict +FIELD rawExp.bg_stdev, 5, %.2f, stdev, restrict + +# What to plot +TOPLOT rawExp.ra,rawExp.decl,rawExp.filter +PLOTTER skyplot.php +PLOTTITLE Sky Plot Chip Index: trunk/ippMonitor/def/simplePlotDiffImage.d =================================================================== --- trunk/ippMonitor/def/simplePlotDiffImage.d (revision 37983) +++ trunk/ippMonitor/def/simplePlotDiffImage.d (revision 37983) @@ -0,0 +1,20 @@ +TABLE diffRun, diffSkyfile, skycell +TITLE New sky plot - diff +FILE simplePlotDiffImage.php +MENU ipp.plots.dat + +WHERE diffRun.state != 'new' +WHERE diffRun.diff_id = diffSkyfile.diff_id +WHERE diffSkyfile.skycell_id = skycell.skycell_id +WHERE diffRun.tess_id = skycell.tess_id + +# field size format name show link to extras +FIELD diffRun.diff_id, 5, %d, Diff ID, restrict +FIELD diffRun.label, 10, %s, Label, restrict +FIELD skycell.radeg, 10, %.6f, RA (deg), restrict +FIELD skycell.decdeg, 10, %.6f, DEC (deg), restrict + +# What to plot +TOPLOT skycell.radeg,skycell.decdeg,'g.00000' +PLOTTER skycellplot.php +PLOTTITLE Sky Plot Diff Index: trunk/ippMonitor/def/stackSummary_Images.d =================================================================== --- trunk/ippMonitor/def/stackSummary_Images.d (revision 37930) +++ trunk/ippMonitor/def/stackSummary_Images.d (revision 37983) @@ -9,10 +9,10 @@ # define image names to be used below # IMAGE VAR basename filerule camera class_id -IMAGE JPEG2 OP1 PPSKYCELL.JPEG2 GPC1 NONE -OP OP1 $stackSummary.path_base . $stackSummary.projection_cell -ARGS ARG7 name=$stackSummary.path_base.$stackSummary.projection_cell +IMAGE JPEG2 OP1 PPSKYCELL.JPEG2 SIMTEST 0 +OP OP1 $stackSummary.path_base . $stackSummary.projection_cell . image +ARGS ARG7 name=$stackSummary.path_base.$stackSummary.projection_cell.image ARGS ARG7 rule=PPSKYCELL.JPEG1 -ARGS ARG7 camera=GPC1 -ARGS ARG7 class_id=NONE +ARGS ARG7 camera=SIMTEST +ARGS ARG7 class_id=0 # field size format name show link to extras Index: trunk/ippMonitor/def/subsetPlotDiffImage.d =================================================================== --- trunk/ippMonitor/def/subsetPlotDiffImage.d (revision 37983) +++ trunk/ippMonitor/def/subsetPlotDiffImage.d (revision 37983) @@ -0,0 +1,21 @@ +TABLE diffRun, diffSkyfile, skycell +TITLE New sky plot - diff +FILE subsetPlotDiffImage.php +MENU ipp.plots.dat + +WHERE diffRun.state != 'new' +WHERE diffRun.diff_id = diffSkyfile.diff_id +WHERE diffSkyfile.skycell_id = skycell.skycell_id +WHERE diffRun.tess_id = skycell.tess_id +WHERE MOD(diffRun.diff_id, 100) = 0 + +# field size format name show link to extras +FIELD diffRun.diff_id, 5, %d, Diff ID, restrict +FIELD diffRun.label, 10, %s, Label, restrict +FIELD skycell.radeg, 10, %.6f, RA (deg), restrict +FIELD skycell.decdeg, 10, %.6f, DEC (deg), restrict + +# What to plot +TOPLOT skycell.radeg,skycell.decdeg,'g.00000' +PLOTTER skycellplot.php +PLOTTITLE Sky Plot Diff Index: trunk/ippMonitor/def/warpFailedSkyfiles.d =================================================================== --- trunk/ippMonitor/def/warpFailedSkyfiles.d (revision 37930) +++ trunk/ippMonitor/def/warpFailedSkyfiles.d (revision 37983) @@ -21,4 +21,5 @@ ARGS ARG7 warpSkyfile.skycell_id=$warpSkyfile.skycell_id ARGS ARG7 camera=$rawExp.camera +ARGS ARG7 state=$warpRun.state ARGS ARG7 basename=$warpSkyfile.path_base @@ -34,5 +35,5 @@ FIELD warpRun.warp_id, 7, %d, Warp ID, value, warpStageExp.php, ARG5 FIELD warpSkyfile.skycell_id, 10, %s, skycell, value, warpFailedSkyfiles.php, ARG6 -FIELD warpRun.state, 7, %s, state, value, warpFailedSkyfiles.php, ARG7 +FIELD warpRun.state, 8, %s, state, value, warpFailedSkyfiles.php, ARG7 FIELD warpRun.label, 7, %s, label FIELD warpRun.data_group, 7, %s, data grp Index: trunk/ippMonitor/raw/czartool_labels.php =================================================================== --- trunk/ippMonitor/raw/czartool_labels.php (revision 37930) +++ trunk/ippMonitor/raw/czartool_labels.php (revision 37983) @@ -37,5 +37,6 @@ "dist", "pub", - "chipbackground"); + ); + # "chipbackground"); $servers=array( @@ -46,10 +47,10 @@ "distribution", "pstamp", - "update", - "publishing", + # "update", + # "publishing", "registration", "replication", "stack", - "deepstack", + # "deepstack", "stdscience", "summitcopy"); @@ -95,5 +96,6 @@ $labels = getLabels($czardb, $selectedMode); $distLabels = getLabels($czardb, "distribution"); -$pubLabels = getLabels($czardb, "publishing"); +# $pubLabels = getLabels($czardb, "publishing"); +$pubLabels = $labels; if ($debug) { @@ -445,9 +447,10 @@ $anyFaults = false; - $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=".$searchState; + // Note: Do not include the state for chip, cam, and warp so that both new and update faults are listed + $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel ; # . "&chipRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults); createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); - $link = "failedCamProcessedExp.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $thisLabel . "&camRun.state=".$searchState; + $link = "failedCamProcessedExp.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $thisLabel ; # . "&camRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "cam", $str, $anyFaults); createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); @@ -457,5 +460,5 @@ createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); - $link = "failedWarpSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $thisLabel . "&warpRun.state=".$searchState; + $link = "failedWarpSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $thisLabel ; # . "&warpRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "warp", $str, $anyFaults); createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); Index: trunk/ippMonitor/raw/getimage.php =================================================================== --- trunk/ippMonitor/raw/getimage.php (revision 37930) +++ trunk/ippMonitor/raw/getimage.php (revision 37983) @@ -94,4 +94,8 @@ } +if ($class_id == "NONE") { + $camera = "SIMPLE"; +} + /* --site=$SITE */ $output = array(); Index: trunk/ippMonitor/raw/ipp.php =================================================================== --- trunk/ippMonitor/raw/ipp.php (revision 37930) +++ trunk/ippMonitor/raw/ipp.php (revision 37983) @@ -789,8 +789,14 @@ $class_id = $_GET['class']; $camera = $_GET['camera']; + $state = $_GET['state']; } else { $basename = $_POST['basename']; $class_id = $_POST['class']; $camera = $_POST['camera']; + $state = $_POST['state']; + } + + if ($state == 'update') { + $filerule = "$filerule.UPDATE"; } Index: trunk/ippMonitor/raw/ipp.plots.dat =================================================================== --- trunk/ippMonitor/raw/ipp.plots.dat (revision 37930) +++ trunk/ippMonitor/raw/ipp.plots.dat (revision 37983) @@ -7,6 +7,10 @@ menulink | menuselect | link | Simple plot - stack | simplePlotStackImage.php menulink | menuselect | link | Simple plot - staticsky | simplePlotStaticskyImage.php -menulink | menuselect | link | Simple plot - skycal | simplePlotSkycalImage.php -menulink | menuselect | link | Heather's Plots | heathers_plot.php +menulink | menuselect | link | Simple plot - skycal | simplePlotSkycalImage.php +menulink | menuselect | link | Simple plot - fforce | simplePlotFForceImage.php +menulink | menuselect | link | Simple plot - chip queue | simplePlotChipQueue.php +menulink | menuselect | link | Simple plot - diff | simplePlotDiffImage.php +menulink | menuselect | link | Subset plot - diff | subsetPlotDiffImage.php +menulink | menuselect | link | Heather's Plots | heathers_plot.php menutop | menutop | plain |   | Index: trunk/ippMonitor/raw/show_log.php =================================================================== --- trunk/ippMonitor/raw/show_log.php (revision 37930) +++ trunk/ippMonitor/raw/show_log.php (revision 37983) @@ -16,4 +16,8 @@ $basename = escapeshellarg($basename); +$state = $_GET[state]; +$state = escapeshellarg($state); +if (!$state) $state = 'new'; + include 'ipp.php'; include 'site.php'; @@ -24,5 +28,9 @@ menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']); -insert_log('LOG.EXP'); +if ($state == 'update') { + insert_log('LOG.EXP.UPDATE'); +} else { + insert_log('LOG.EXP'); +} exit();