Index: trunk/ippMonitor/def/camProcessedExp_failure.d =================================================================== --- trunk/ippMonitor/def/camProcessedExp_failure.d (revision 18313) +++ trunk/ippMonitor/def/camProcessedExp_failure.d (revision 18340) @@ -1,5 +1,5 @@ TABLE camRun, camProcessedExp, chipRun, rawExp TITLE Camera Processed (No Images) -FILE camProcessedExp_NoImages.php +FILE camProcessedExp_failure.php MENU ipp.science.dat @@ -26,9 +26,9 @@ OP OP2 $rawExp.decl * 57.295783 -# field size format name show link to extras -FIELD chipRun.exp_id, 5, %d, Exp ID, value, chipProcessedImfile.php, ARG1 -FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD chipRun.chip_id, 5, %d, chip ID -FIELD camRun.cam_id, 5, %d, cam ID, value, chipProcessedExp.php, ARG1 +# field size format name show link to extras +FIELD chipRun.exp_id, 5, %d, Exp ID, value, chipProcessedImfile.php, ARG1 +FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %d, chip ID, value, chipProcessedExp.php, ARG1 +FIELD camRun.cam_id, 5, %d, cam ID, value, camProcessedExp_failure.php, ARG2 FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera @@ -50,2 +50,4 @@ FIELD camProcessedExp.path_base, 5, %s, path_base, none FIELD rawExp.exp_id, 5, %s, Exp ID, none + +TAIL PHP insert_log ('LOG.IMFILE'); Index: trunk/ippMonitor/def/camStageExp.d =================================================================== --- trunk/ippMonitor/def/camStageExp.d (revision 18340) +++ trunk/ippMonitor/def/camStageExp.d (revision 18340) @@ -0,0 +1,32 @@ +TABLE camRun, chipRun, rawExp +TITLE Camera Pending +FILE camPendingExp.php +MENU ipp.science.dat + +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id + +ARGS ARG1 chipRun.exp_id=$chipRun.exp_id + +OP OP1 $rawExp.ra * 57.295783 +OP OP2 $rawExp.decl * 57.295783 + +# field size format name show link to extras +FIELD chipRun.exp_id, 5, %s, exposure ID, value, chipProcessedImfile.php, ARG1 +FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %s, chip ID, value, chipProcessedExp.php, ARG1 +FIELD camRun.cam_id, 5, %s, cam ID +FIELD camRun.state, 5, %s, state +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 19, %T, Date/Time +FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 +FIELD rawExp.object, 10, %s, Object +FIELD rawExp.filter, 10, %s, FILTER +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD rawExp.bg, 5, %.2f, backgnd +FIELD rawExp.bg_stdev, 5, %.2f, stdev +FIELD rawExp.bg_mean_stdev, 5, %.2f, <backgnd> +FIELD rawExp.sat_pixel_frac, 5, %.3f, f(sat pixels) Index: trunk/ippMonitor/def/chipPendingExp.d =================================================================== --- trunk/ippMonitor/def/chipPendingExp.d (revision 18313) +++ trunk/ippMonitor/def/chipPendingExp.d (revision 18340) @@ -28,5 +28,5 @@ FIELD rawExp.bg, 5, %.2f, backgnd FIELD rawExp.bg_stdev, 5, %.2f, stdev -FIELD rawExp.comment, 5, %s, CMMTOBS +FIELD rawExp.comment, 65, %s, Comment # FIELD rawExp.bg_mean_stdev, 5, %7.2f, <backgnd> Index: trunk/ippMonitor/def/chipPendingImfile.d =================================================================== --- trunk/ippMonitor/def/chipPendingImfile.d (revision 18313) +++ trunk/ippMonitor/def/chipPendingImfile.d (revision 18340) @@ -1,12 +1,31 @@ -TABLE chipPendingImfile -TITLE chipPendingImfile -FILE chipPendingImfile.php -MENU ipp.imfiles.dat +TABLE chipRun, rawExp +TITLE Chip Pending Imfiles +FILE chipPendingExp.php +MENU ipp.science.dat -# field size format name show link to extras -FIELD exp_id, 5, %s, Exp ID -FIELD class_id, 5, %s, Class ID -FIELD uri, 5, %s, URI -FIELD recipe, 5, %s, recipe -FIELD guide_version, 5, %s, guide version -FIELD chip_version, 5, %s, chip version +# limit this table to non-OBJECT types of images +WHERE chipRun.state = 'run' +WHERE chipRun.exp_id = rawExp.exp_id + +ARGS ARG1 exp_id=$chipRun.exp_id + +OP OP1 $rawExp.ra * 57.295783 +OP OP2 $rawExp.decl * 57.295783 + +# field size format name show link to extras +FIELD chipRun.exp_id, 5, %d, Exp ID +FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, chip ID +FIELD chipRun.state, 7, %s, state +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 19, %T, Date/Time +FIELD rawExp.ra, 5, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 5, %10.6f, DEC, op=OP2 +FIELD rawExp.object, 8, %s, Object +FIELD rawExp.filter, 10, %s, FILTER +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD rawExp.bg, 5, %.2f, backgnd +FIELD rawExp.bg_stdev, 5, %.2f, stdev +FIELD rawExp.comment, 65, %s, Comment Index: trunk/ippMonitor/def/chipProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/chipProcessedImfile.d (revision 18313) +++ trunk/ippMonitor/def/chipProcessedImfile.d (revision 18340) @@ -24,5 +24,5 @@ FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile.php, ARG2 FIELD chipProcessedImfile.class_id, 5, %s, Class ID -FIELD chipRun.chip_id, 7, %d, chip ID +FIELD chipRun.chip_id, 7, %s, chip ID FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: trunk/ippMonitor/def/chipProcessedImfile_failure.d =================================================================== --- trunk/ippMonitor/def/chipProcessedImfile_failure.d (revision 18313) +++ trunk/ippMonitor/def/chipProcessedImfile_failure.d (revision 18340) @@ -13,4 +13,5 @@ ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG2 chipProcessedImfile.class_id=$chipProcessedImfile.class_id ARGS ARG2 camera=$rawExp.camera ARGS ARG2 basename=$chipProcessedImfile.path_base @@ -22,5 +23,5 @@ # field size format name show link to extras FIELD chipRun.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 -FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile.php, ARG2 +FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile_failure.php, ARG2 FIELD chipProcessedImfile.class_id, 5, %s, Class ID FIELD chipRun.chip_id, 7, %d, chip ID Index: trunk/ippMonitor/def/chipStageExp.d =================================================================== --- trunk/ippMonitor/def/chipStageExp.d (revision 18340) +++ trunk/ippMonitor/def/chipStageExp.d (revision 18340) @@ -0,0 +1,35 @@ +TABLE chipRun, rawExp +TITLE Chip Stage Exposures +FILE chipStageExp.php +MENU ipp.science.dat + +# limit this table to non-OBJECT types of images +# WHERE chipRun.state = 'run' +WHERE chipRun.exp_id = rawExp.exp_id + +ARGS ARG1 exp_id=$chipRun.exp_id + +OP OP1 $rawExp.ra * 57.295783 +OP OP2 $rawExp.decl * 57.295783 + +# field size format name show link to extras +FIELD chipRun.exp_id, 5, %d, Exp ID +FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, chip ID +FIELD chipRun.state, 7, %s, state +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 19, %T, Date/Time +FIELD rawExp.ra, 5, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 5, %10.6f, DEC, op=OP2 +FIELD rawExp.object, 8, %s, Object +FIELD rawExp.filter, 10, %s, FILTER +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD rawExp.bg, 5, %.2f, backgnd +FIELD rawExp.bg_stdev, 5, %.2f, stdev +FIELD rawExp.comment, 65, %s, Comment + +# FIELD rawExp.bg_mean_stdev, 5, %7.2f, <backgnd> +# FIELD chipPendingExp.reduction, 20, reduction +# FIELD chipPendingExp.guide_id, 20, guide ID Index: trunk/ippMonitor/def/rawScienceExp.d =================================================================== --- trunk/ippMonitor/def/rawScienceExp.d (revision 18313) +++ trunk/ippMonitor/def/rawScienceExp.d (revision 18340) @@ -29,2 +29,3 @@ FIELD bg_stdev, 8, %.2f, stdev FIELD bg_mean_stdev, 8, %.2f, [stdev] +FIELD comment, 65, %s, Comment Index: trunk/ippMonitor/raw/ipp.php =================================================================== --- trunk/ippMonitor/raw/ipp.php (revision 18313) +++ trunk/ippMonitor/raw/ipp.php (revision 18340) @@ -613,4 +613,9 @@ } + echo "insert log
\n"; + echo "basename: $basename
\n"; + echo "class_id: $class_id
\n"; + echo "camera: $camera
\n"; + if (! $class_id) { $class_id = "NONE"; } Index: trunk/ippMonitor/raw/ipp.science.dat =================================================================== --- trunk/ippMonitor/raw/ipp.science.dat (revision 18313) +++ trunk/ippMonitor/raw/ipp.science.dat (revision 18340) @@ -28,17 +28,21 @@ menutop | menutop | plain |   | -menutop | menuselect | plain | Guide Processed Exp | +menulink | menuselect | link | Chip-Stage Exp | chipStageExp.php +menulink | menuselect | link | Chip Pending Exp | chipPendingExp.php menulink | menuselect | link | Chip Processed Exp | chipProcessedExp.php +menulink | menuselect | link | Chip Pending Imfiles | chipPendingImfile.php menulink | menuselect | link | Chip Processed Imfiles | chipProcessedImfile.php +menulink | menuselect | link | Chip Failed Imfiles | chipProcessedImfile_failure.php + +menutop | menutop | plain |   | +menulink | menuselect | link | Cam-Stage Exp | camStageExp.php +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 Failed Exp | camProcessedExp_failure.php menutop | menutop | plain |   | -menutop | menuselect | plain | Guide Pending Exp | guidePendingExp.php -menulink | menuselect | link | Chip Pending Exp | chipPendingExp.php -menulink | menuselect | link | Cam Pending Exp | camPendingExp.php +menutop | menutop | plain | Fake Stage (missing) | menutop | menutop | plain |   | -menutop | menuselect | plain | Failures | -menulink | menuselect | link | Chip Failed Imfiles | chipProcessedImfile_failure.php -menulink | menuselect | link | Cam Failed Exp | camProcessedExp_failure.php +menutop | menuselect | plain | Imfile Tables |