Index: trunk/ippMonitor/Makefile.in =================================================================== --- trunk/ippMonitor/Makefile.in (revision 21137) +++ trunk/ippMonitor/Makefile.in (revision 21339) @@ -130,6 +130,8 @@ $(DESTWWW)/diffSkyfile.php \ $(DESTWWW)/stackRun.php \ +$(DESTWWW)/stackSummary.php \ $(DESTWWW)/stackInputSkyfile.php \ $(DESTWWW)/stackProcessedSkyfile.php \ +$(DESTWWW)/stackProcessedSkyfile_Images.php \ $(DESTWWW)/stackFailedSkyfile.php \ $(DESTWWW)/calDB.php \ Index: trunk/ippMonitor/def/diffInputSkyfile.d =================================================================== --- trunk/ippMonitor/def/diffInputSkyfile.d (revision 21137) +++ trunk/ippMonitor/def/diffInputSkyfile.d (revision 21339) @@ -2,5 +2,5 @@ TITLE diffInputSkyfile FILE diffInputSkyfile.php -MENU ipp.diff.dat +MENU ipp.stack.dat # field size format name show link to extras Index: trunk/ippMonitor/def/diffRun.d =================================================================== --- trunk/ippMonitor/def/diffRun.d (revision 21137) +++ trunk/ippMonitor/def/diffRun.d (revision 21339) @@ -2,5 +2,5 @@ TITLE diffRun FILE diffRun.php -MENU ipp.diff.dat +MENU ipp.stack.dat # field size format name show link to extras Index: trunk/ippMonitor/def/diffSkyfile.d =================================================================== --- trunk/ippMonitor/def/diffSkyfile.d (revision 21137) +++ trunk/ippMonitor/def/diffSkyfile.d (revision 21339) @@ -2,5 +2,5 @@ TITLE diffSkyfile FILE diffSkyfile.php -MENU ipp.diff.dat +MENU ipp.stack.dat # field size format name show link to extras Index: trunk/ippMonitor/def/stackFailedSkyfile.d =================================================================== --- trunk/ippMonitor/def/stackFailedSkyfile.d (revision 21137) +++ trunk/ippMonitor/def/stackFailedSkyfile.d (revision 21339) @@ -9,5 +9,4 @@ ARGS ARG7 stackRun.stack_id=$stackRun.stack_id ARGS ARG7 stackRun.skycell_id=$stackRun.skycell_id -# XXX need to fix this: there may not be a single camera per stack... ARGS ARG7 camera=GPC1 ARGS ARG7 basename=$stackSumSkyfile.path_base @@ -16,8 +15,23 @@ FIELD stackRun.stack_id, 5, %s, Stack ID FIELD stackRun.skycell_id, 5, %s, Skycell ID +FIELD stackRun.label, 5, %s, Label +FIELD stackRun.filter, 5, %s, Filter +FIELD stackRun.tess_id, 5, %s, Tess ID FIELD stackRun.state, 7, %s, State, value, stackFailedSkyfile.php, ARG7 FIELD stackSumSkyfile.bg, 5, %.2f, backgnd FIELD stackSumSkyfile.bg_stdev, 5, %.2f, stdev -FIELD stackSumSkyfile.dtime_stack, 5, %.2f, dtime +FIELD stackSumSkyfile.dtime_stack, 5, %.2f, t(stack) +FIELD stackSumSkyfile.dtime_match_mean, 5, %.2f, t(match) +FIELD stackSumSkyfile.dtime_initial, 5, %.2f, t(initial) +FIELD stackSumSkyfile.dtime_reject, 5, %.2f, t(reject) +FIELD stackSumSkyfile.dtime_final, 5, %.2f, t(final) +FIELD stackSumSkyfile.dtime_phot, 5, %.2f, t(phot) +FIELD stackSumSkyfile.dtime_script, 5, %.2f, t(script) + +FIELD stackSumSkyfile.match_mean, 5, %.2f, match +FIELD stackSumSkyfile.match_stdev, 5, %.2f, match err + +FIELD stackSumSkyfile.reject_images, 5, %d, n(reject) +FIELD stackSumSkyfile.sources, 5, %d, n(sources) FIELD stackSumSkyfile.path_base, 5, %s, path_base, none Index: trunk/ippMonitor/def/stackInputSkyfile.d =================================================================== --- trunk/ippMonitor/def/stackInputSkyfile.d (revision 21137) +++ trunk/ippMonitor/def/stackInputSkyfile.d (revision 21339) @@ -33,4 +33,5 @@ FIELD stackRun.skycell_id, 5, %s, Skycell ID FIELD stackRun.state, 7, %s, State +FIELD stackRun.label, 7, %s, Label FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: trunk/ippMonitor/def/stackProcessedSkyfile.d =================================================================== --- trunk/ippMonitor/def/stackProcessedSkyfile.d (revision 21137) +++ trunk/ippMonitor/def/stackProcessedSkyfile.d (revision 21339) @@ -10,5 +10,4 @@ ARGS ARG7 stackRun.stack_id=$stackRun.stack_id ARGS ARG7 stackRun.skycell_id=$stackRun.skycell_id -# XXX need to fix this: there may not be a single camera per stack... ARGS ARG7 camera=GPC1 ARGS ARG7 basename=$stackSumSkyfile.path_base @@ -17,8 +16,23 @@ FIELD stackRun.stack_id, 5, %s, Stack ID FIELD stackRun.skycell_id, 5, %s, Skycell ID +FIELD stackRun.label, 5, %s, Label +FIELD stackRun.filter, 5, %s, Filter +FIELD stackRun.tess_id, 5, %s, Tess ID FIELD stackRun.state, 7, %s, State, value, stackProcessedSkyfile.php, ARG7 FIELD stackSumSkyfile.bg, 5, %.2f, backgnd FIELD stackSumSkyfile.bg_stdev, 5, %.2f, stdev -FIELD stackSumSkyfile.dtime_stack, 5, %.2f, dtime +FIELD stackSumSkyfile.dtime_stack, 5, %.2f, t(stack) +FIELD stackSumSkyfile.dtime_match_mean, 5, %.2f, t(match) +FIELD stackSumSkyfile.dtime_initial, 5, %.2f, t(initial) +FIELD stackSumSkyfile.dtime_reject, 5, %.2f, t(reject) +FIELD stackSumSkyfile.dtime_final, 5, %.2f, t(final) +FIELD stackSumSkyfile.dtime_phot, 5, %.2f, t(phot) +FIELD stackSumSkyfile.dtime_script, 5, %.2f, t(script) + +FIELD stackSumSkyfile.match_mean, 5, %.2f, match +FIELD stackSumSkyfile.match_stdev, 5, %.2f, match err + +FIELD stackSumSkyfile.reject_images, 5, %d, n(reject) +FIELD stackSumSkyfile.sources, 5, %d, n(sources) FIELD stackSumSkyfile.path_base, 5, %s, path_base, none Index: trunk/ippMonitor/def/stackProcessedSkyfile_Images.d =================================================================== --- trunk/ippMonitor/def/stackProcessedSkyfile_Images.d (revision 21339) +++ trunk/ippMonitor/def/stackProcessedSkyfile_Images.d (revision 21339) @@ -0,0 +1,46 @@ +TABLE stackRun, stackSumSkyfile +TITLE Stack Processed Skyfiles +FILE stackProcessedSkyfile_Images.php +MENU ipp.stack.dat + +WHERE stackRun.stack_id = stackSumSkyfile.stack_id +WHERE stackRun.state = 'full' +WHERE stackSumSkyfile.fault = 0 + +# define image names to be used below +# IMAGE VAR basename filerule camera class_id +IMAGE JPEG2 $stackSumSkyfile.path_base PPSTACK.OUTPUT.JPEG2 GPC1 NONE + +ARGS ARG7 stackRun.stack_id=$stackRun.stack_id +ARGS ARG7 stackRun.skycell_id=$stackRun.skycell_id +ARGS ARG7 camera=GPC1 +ARGS ARG7 basename=$stackSumSkyfile.path_base + +# field size format name show link to extras +FIELD stackRun.stack_id, 5, %s, Stack ID +FIELD stackRun.skycell_id, 5, %s, Skycell ID +FIELD stackRun.label, 5, %s, Label +FIELD *, 8, %s, image, image=JPEG2, stackProcessedSkyfile_Images.php, ARG7 +FIELD stackRun.filter, 5, %s, Filter +FIELD stackRun.tess_id, 5, %s, Tess ID +FIELD stackRun.state, 7, %s, State +FIELD stackSumSkyfile.bg, 5, %.2f, backgnd +FIELD stackSumSkyfile.bg_stdev, 5, %.2f, stdev +FIELD stackSumSkyfile.dtime_stack, 5, %.2f, t(stack) +FIELD stackSumSkyfile.dtime_match_mean, 5, %.2f, t(match) +FIELD stackSumSkyfile.dtime_initial, 5, %.2f, t(initial) +FIELD stackSumSkyfile.dtime_reject, 5, %.2f, t(reject) +FIELD stackSumSkyfile.dtime_final, 5, %.2f, t(final) +FIELD stackSumSkyfile.dtime_phot, 5, %.2f, t(phot) +FIELD stackSumSkyfile.dtime_script, 5, %.2f, t(script) + +FIELD stackSumSkyfile.match_mean, 5, %.2f, match +FIELD stackSumSkyfile.match_stdev, 5, %.2f, match err + +FIELD stackSumSkyfile.reject_images, 5, %d, n(reject) +FIELD stackSumSkyfile.sources, 5, %d, n(sources) + +FIELD stackSumSkyfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_image ('PPSTACK.OUTPUT.JPEG1'); +TAIL PHP insert_log ('LOG.EXP'); Index: trunk/ippMonitor/def/stackRun.d =================================================================== --- trunk/ippMonitor/def/stackRun.d (revision 21137) +++ trunk/ippMonitor/def/stackRun.d (revision 21339) @@ -9,5 +9,5 @@ FIELD filter, 5, %s, Filter FIELD label, 5, %s, Label -FIELD tess_id, 5, %s, Tessellation ID +FIELD tess_id, 5, %s, Tess ID FIELD state, 5, %s, State Index: trunk/ippMonitor/def/stackSummary.d =================================================================== --- trunk/ippMonitor/def/stackSummary.d (revision 21339) +++ trunk/ippMonitor/def/stackSummary.d (revision 21339) @@ -0,0 +1,16 @@ +TABLE stackRun +TITLE Stack Summary +FILE stackSummary.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.science.dat =================================================================== --- trunk/ippMonitor/raw/ipp.science.dat (revision 21137) +++ trunk/ippMonitor/raw/ipp.science.dat (revision 21339) @@ -40,5 +40,5 @@ menulink | menuselect | link | Cam Pending Exp | camPendingExp.php menulink | menuselect | link | Cam Processed Exp | camProcessedExp_NoImages.php -menulink | menuselect | link | Cam Proc. Exp w/ Images | camProcessedExp.php +menulink | menuselect | link | Cam Proc. w/ Images | camProcessedExp.php menulink | menuselect | link | Cam IQ Stats | camIQstats.php menulink | menuselect | link | Cam Failed Exp | camProcessedExp_failure.php Index: trunk/ippMonitor/raw/ipp.stack.dat =================================================================== --- trunk/ippMonitor/raw/ipp.stack.dat (revision 21137) +++ trunk/ippMonitor/raw/ipp.stack.dat (revision 21339) @@ -26,7 +26,9 @@ menutop | menutop | plain |   | +menulink | menuselect | link | Stack Summary | stackSummary.php menulink | menuselect | link | Stack Run | stackRun.php menulink | menuselect | link | Stack Input Skyfile | stackInputSkyfile.php menulink | menuselect | link | Stack Processed Skyfile | stackProcessedSkyfile.php +menulink | menuselect | link | Stack Proc. w/ Images | stackProcessedSkyfile_Images.php menulink | menuselect | link | Stack Failed Skyfile | stackFailedSkyfile.php