Index: trunk/ippMonitor/Makefile.in =================================================================== --- trunk/ippMonitor/Makefile.in (revision 23906) +++ trunk/ippMonitor/Makefile.in (revision 23923) @@ -126,7 +126,10 @@ $(DESTWWW)/warpProcessedSkyfiles.php \ $(DESTWWW)/warpFailedSkyfiles.php \ +$(DESTWWW)/diffSummary.php \ $(DESTWWW)/diffRun.php \ $(DESTWWW)/diffInputSkyfile.php \ -$(DESTWWW)/diffSkyfile.php \ +$(DESTWWW)/diffProcessedSkyfile.php \ +$(DESTWWW)/diffProcessedSkyfile_Images.php \ +$(DESTWWW)/diffFailedSkyfile.php \ $(DESTWWW)/stackRun.php \ $(DESTWWW)/stackSummary.php \ Index: trunk/ippMonitor/def/diffFailedSkyfile.d =================================================================== --- trunk/ippMonitor/def/diffFailedSkyfile.d (revision 23923) +++ trunk/ippMonitor/def/diffFailedSkyfile.d (revision 23923) @@ -0,0 +1,24 @@ +TABLE diffRun, diffSkyfile +TITLE Diff Failed Skyfiles +FILE diffFailedSkyfile.php +MENU ipp.stack.dat + +WHERE diffRun.diff_id = diffSkyfile.diff_id +WHERE diffSkyfile.fault != 0 + +ARGS ARG7 diffSkyfile.diff_id=$diffSkyfile.diff_id +ARGS ARG7 diffSkyfile.skycell_id=$diffSkyfile.skycell_id +ARGS ARG7 camera=GPC1 +ARGS ARG7 basename=$diffSkyfile.path_base + +# field size format name show link to extras +FIELD diffSkyfile.diff_id, 5, %d, Diff ID +FIELD diffSkyfile.skycell_id, 5, %s, Skycell ID +FIELD diffRun.label, 5, %s, Label +# FIELD diffRun.filter, 5, %s, Filter +FIELD diffRun.tess_id, 5, %s, Tess ID +FIELD diffRun.state, 7, %s, State, value, diffProcessedSkyfile.php, ARG7 +FIELD diffSkyfile.fault, 5, %d, fault +FIELD diffSkyfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_log ('LOG.EXP'); Index: trunk/ippMonitor/def/diffInputSkyfile.d =================================================================== --- trunk/ippMonitor/def/diffInputSkyfile.d (revision 23906) +++ trunk/ippMonitor/def/diffInputSkyfile.d (revision 23923) @@ -1,12 +1,19 @@ -TABLE diffInputSkyfile +TABLE diffInputSkyfile, diffRun TITLE diffInputSkyfile FILE diffInputSkyfile.php MENU ipp.stack.dat -# field size format name show link to extras -FIELD diff_id, 20, %s, diff ID -FIELD warp_id, 20, %s, warp ID -FIELD skycell_id, 20, %s, skycell ID -FIELD tess_id, 20, %s, tessellation ID -FIELD kind, 20, %s, Kind -FIELD template, 20, %s, Template? +WHERE diffInputSkyfile.diff_id = diffRun.diff_id + +# field size format name show link to extras +FIELD diffInputSkyfile.diff_id, 5, %d, diff ID +FIELD diffInputSkyfile.diff_skyfile_id, 5, %d, skyfile ID +FIELD diffInputSkyfile.skycell_id, 8, %s, skycell ID +FIELD diffRun.state, 7, %s, state +FIELD diffRun.label, 7, %s, label +FIELD diffRun.magicked, 4, %d, Magicked +FIELD diffInputSkyfile.warp1, 5, %d, warp 1 +FIELD diffInputSkyfile.stack1, 5, %d, stack 1 +FIELD diffInputSkyfile.warp2, 5, %d, warp 2 +FIELD diffInputSkyfile.stack2, 5, %d, stack 2 +FIELD diffInputSkyfile.tess_id, 8, %s, tessellation ID Index: trunk/ippMonitor/def/diffProcessedSkyfile.d =================================================================== --- trunk/ippMonitor/def/diffProcessedSkyfile.d (revision 23923) +++ trunk/ippMonitor/def/diffProcessedSkyfile.d (revision 23923) @@ -0,0 +1,34 @@ +TABLE diffRun, diffSkyfile +TITLE Diff Processed Skyfiles +FILE diffProcessedSkyfile.php +MENU ipp.stack.dat + +WHERE diffRun.diff_id = diffSkyfile.diff_id +WHERE diffRun.state = 'full' +WHERE diffSkyfile.fault = 0 + +ARGS ARG7 diffSkyfile.diff_id=$diffSkyfile.diff_id +ARGS ARG7 diffSkyfile.skycell_id=$diffSkyfile.skycell_id +ARGS ARG7 camera=GPC1 +ARGS ARG7 basename=$diffSkyfile.path_base + +# field size format name show link to extras +FIELD diffSkyfile.diff_id, 5, %d, Diff ID +FIELD diffSkyfile.skycell_id, 4, %s, Skycell ID +FIELD diffRun.label, 5, %s, Label +# FIELD diffRun.filter, 5, %s, Filter +FIELD diffRun.tess_id, 5, %s, Tess ID +FIELD diffRun.state, 7, %s, State, value, diffProcessedSkyfile.php, ARG7 +FIELD diffSkyfile.bg, 5, %.2f, backgnd +FIELD diffSkyfile.bg_stdev, 5, %.2f, stdev +FIELD diffSkyfile.dtime_diff, 5, %.2f, t(diff) +FIELD diffSkyfile.dtime_match, 5, %.2f, t(match) +FIELD diffSkyfile.dtime_phot, 5, %.2f, t(phot) +FIELD diffSkyfile.dtime_script, 5, %.2f, t(script) +FIELD diffSkyfile.stamps_num, 5, %d, n(stamps) +FIELD diffSkyfile.stamps_mean, 5, %.2f, mean(stamps) +FIELD diffSkyfile.stamps_rms, 5, %.2f, rms(stamps) +FIELD diffSkyfile.sources, 5, %d, n(sources) +FIELD diffSkyfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_log ('LOG.EXP'); Index: trunk/ippMonitor/def/diffProcessedSkyfile_Images.d =================================================================== --- trunk/ippMonitor/def/diffProcessedSkyfile_Images.d (revision 23923) +++ trunk/ippMonitor/def/diffProcessedSkyfile_Images.d (revision 23923) @@ -0,0 +1,41 @@ +TABLE diffRun, diffSkyfile +TITLE Diff Processed Skyfiles +FILE diffProcessedSkyfile_Images.php +MENU ipp.stack.dat + +WHERE diffRun.diff_id = diffSkyfile.diff_id +WHERE diffRun.state = 'full' +WHERE diffSkyfile.fault = 0 + +# define image names to be used below +# IMAGE VAR basename filerule camera class_id +IMAGE JPEG2 $diffSkyfile.path_base PPSUB.OUTPUT.JPEG2 GPC1 NONE + +# XXX need to get camera from lookup +ARGS ARG7 diffSkyfile.diff_id=$diffSkyfile.diff_id +ARGS ARG7 diffSkyfile.skycell_id=$diffSkyfile.skycell_id +ARGS ARG7 camera=GPC1 +ARGS ARG7 basename=$diffSkyfile.path_base + +# field size format name show link to extras +FIELD diffSkyfile.diff_id, 5, %d, Diff ID +FIELD diffSkyfile.skycell_id, 5, %s, Skycell ID +FIELD diffRun.label, 5, %s, Label +FIELD *, 8, %s, image, image=JPEG2, diffProcessedSkyfile_Images.php, ARG7 +# FIELD diffRun.filter, 5, %s, Filter +FIELD diffRun.tess_id, 5, %s, Tess ID +FIELD diffRun.state, 7, %s, State, value, diffProcessedSkyfile.php, ARG7 +FIELD diffSkyfile.bg, 5, %.2f, backgnd +FIELD diffSkyfile.bg_stdev, 5, %.2f, stdev +FIELD diffSkyfile.dtime_diff, 5, %.2f, t(diff) +FIELD diffSkyfile.dtime_match, 5, %.2f, t(match) +FIELD diffSkyfile.dtime_phot, 5, %.2f, t(phot) +FIELD diffSkyfile.dtime_script, 5, %.2f, t(script) +FIELD diffSkyfile.stamps_num, 5, %d, n(stamps) +FIELD diffSkyfile.stamps_mean, 5, %.2f, mean(stamps) +FIELD diffSkyfile.stamps_rms, 5, %.2f, rms(stamps) +FIELD diffSkyfile.sources, 5, %d, n(sources) +FIELD diffSkyfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_image ('PPSUB.OUTPUT.JPEG1'); +TAIL PHP insert_log ('LOG.EXP'); Index: trunk/ippMonitor/def/diffRun.d =================================================================== --- trunk/ippMonitor/def/diffRun.d (revision 23906) +++ trunk/ippMonitor/def/diffRun.d (revision 23923) @@ -5,9 +5,12 @@ # field size format name show link to extras -FIELD diff_id, 20, %s, diff ID -FIELD state, 20, %s, state -FIELD workdir, 20, %s, workdir -FIELD dvodb, 20, %s, DVO database -FIELD registered, 20, %s, Time registered -FIELD skycell_id, 20, %s, skycell ID -FIELD tess_id, 20, %s, tessellation ID +FIELD diff_id, 5, %d, diff ID +FIELD state, 7, %s, state +FIELD label, 7, %s, label +FIELD magicked, 4, %d, Magicked +FIELD tess_id, 8, %s, tess ID +FIELD exp_id, 5, %d, exp ID +FIELD registered, 19, %T, Time registered +FIELD reduction, 10, %s, reduction +FIELD workdir, 10, %s, workdir +FIELD dvodb, 10, %s, DVO database Index: trunk/ippMonitor/def/diffSummary.d =================================================================== --- trunk/ippMonitor/def/diffSummary.d (revision 23923) +++ trunk/ippMonitor/def/diffSummary.d (revision 23923) @@ -0,0 +1,16 @@ +TABLE diffRun +TITLE Diff Summary +FILE diffSummary.php +MENU ipp.stack.dat + +# field size format name show link to extras +FIELD label, 7, %s, label +FIELD workdir, 7, %s, workdir +FIELD tess_id, 7, %s, tess_id +FIELD state, 7, %s, state +FIELD count(state) as n, 7, %d, count + +MODE summary +GROUP state +GROUP label +GROUP workdir Index: trunk/ippMonitor/raw/ipp.stack.dat =================================================================== --- trunk/ippMonitor/raw/ipp.stack.dat (revision 23906) +++ trunk/ippMonitor/raw/ipp.stack.dat (revision 23923) @@ -34,5 +34,10 @@ menutop | menutop | plain |   | +menulink | menuselect | link | Diff Summary | diffSummary.php menulink | menuselect | link | Diff Run | diffRun.php menulink | menuselect | link | Diff Input Skyfile | diffInputSkyfile.php -menulink | menuselect | link | Diff Skyfile | diffSkyfile.php +menulink | menuselect | link | Diff Processed Skyfile | diffProcessedSkyfile.php +menulink | menuselect | link | Diff Proc. w/ Images | diffProcessedSkyfile_Images.php +menulink | menuselect | link | Diff Failed Skyfile | diffFailedSkyfile.php + +# menulink | menuselect | link | Diff Skyfile | diffSkyfile.php