Index: branches/eam_branches/ipp-20220316/ippMonitor/def/fpcamPendingExp.d =================================================================== --- branches/eam_branches/ipp-20220316/ippMonitor/def/fpcamPendingExp.d (revision 42210) +++ branches/eam_branches/ipp-20220316/ippMonitor/def/fpcamPendingExp.d (revision 42210) @@ -0,0 +1,41 @@ +TABLE fpcamRun JOIN camRun using (cam_id) JOIN chipRun ON (fpcamRun.chip_id = chipRun.chip_id) JOIN rawExp using (exp_id) +TITLE Forced Photometry on Camera Stage Exposures (Pending) +FILE fpcamPendingExp.php +MENU ipp.ffs.dat + +WHERE fpcamRun.state = 'new' + +RESTRICT_COUNT AND rawExp.dateobs >= CURDATE() +UNRESTRICTED AND rawExp.dateobs >= CURDATE() + +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 camRun.cam_id=$camRun.cam_id + +OP OP1 $rawExp.ra * 57.295783 +OP OP2 $rawExp.decl * 57.295783 + +# field size format name show link to extras +FIELD rawExp.exp_name, 10, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fpcamRun.cam_id, 5, %d, Cam ID +FIELD fpcamRun.state, 5, %s, State +FIELD fpcamRun.label, 5, %s, Label +FIELD fpcamRun.data_group, 5, %s, data grp +FIELD fpcamRun.dist_group, 5, %s, dist grp +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 19, %T, Date/Time +FIELD rawExp.ra, 8, %C, RA, op=OP1 +FIELD rawExp.decl, 8, %C, 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.comment, 65, %s, Comment + +# FIELD rawExp.bg_mean_stdev, 5, %.2f, <backgnd> Index: branches/eam_branches/ipp-20220316/ippMonitor/def/fpcamProcessedExp.d =================================================================== --- branches/eam_branches/ipp-20220316/ippMonitor/def/fpcamProcessedExp.d (revision 42210) +++ branches/eam_branches/ipp-20220316/ippMonitor/def/fpcamProcessedExp.d (revision 42210) @@ -0,0 +1,58 @@ +TABLE fpcamRun JOIN fpcamProcessedExp using (fpcam_id) JOIN camRun using (cam_id) JOIN chipRun ON (fpcamRun.chip_id = chipRun.chip_id) JOIN rawExp using (exp_id) +TITLE Forced Photometry on Camera Stage Exposures (Processed) +FILE fpcamProcessedExp.php +MENU ipp.ffs.dat + +# the following WHERE clauses are added to all queries joined by AND +WHERE fpcamRun.state = 'full' +WHERE fpcamProcessedExp.fault = 0 + +RESTRICT_COUNT AND rawExp.dateobs >= CURDATE() +UNRESTRICTED AND rawExp.dateobs >= CURDATE() + +# define the arguments supplied to the links below (if any) +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 camRun.cam_id=$camRun.cam_id +ARGS ARG4 fpcamRun.fpcam_id=$fpcamRun.fpcam_id + +#ARGS ARG5 camRun.cam_id=$camRun.cam_id +#ARGS ARG5 camera=$rawExp.camera +#ARGS ARG5 basename=$camProcessedExp.path_base + +OP OP1 $rawExp.ra * 57.295783 +OP OP2 $rawExp.decl * 57.295783 + +# field size format name show link to extras +FIELD rawExp.exp_name, 10, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fpcamRun.fpcam_id, 5, %d, FPCam ID, value, fpcamProcessedExp.php, ARG4 +FIELD fpcamRun.state, 5, %s, state +FIELD fpcamRun.label, 5, %s, Label +FIELD fpcamRun.data_group, 5, %s, data grp +FIELD fpcamRun.dist_group, 5, %s, dist grp +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 19, %T, Date/Time +FIELD rawExp.ra, 8, %C, RA, op=OP1 +FIELD rawExp.decl, 8, %C, 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 camProcessedExp.bg, 5, %.2f, backgnd +# FIELD camProcessedExp.bg_stdev, 5, %.2f, stdev +# FIELD camProcessedExp.n_stars, 5, %d, Nstars +# FIELD camProcessedExp.n_astrom, 5, %d, Nastrom +# FIELD camProcessedExp.sigma_ra, 5, %f, sigma ra +# FIELD camProcessedExp.fwhm_major, 5, %f, FHWM (major) +FIELD rawExp.comment, 65, %s, Comment + +#FIELD camProcessedExp.path_base, 5, %s, path_base, none +#FIELD rawExp.exp_id, 5, %s, Exp ID, none + +# the last two are used as arguments elsewhere, thus needed in the list, even if not displayed +# FIELD camRun.reduction, 5, %s, reduction +# FIELD camProcessedExp.bg_mean_stdev, 5, %.2f, <backgnd> Index: branches/eam_branches/ipp-20220316/ippMonitor/def/fpcamStageExp.d =================================================================== --- branches/eam_branches/ipp-20220316/ippMonitor/def/fpcamStageExp.d (revision 42210) +++ branches/eam_branches/ipp-20220316/ippMonitor/def/fpcamStageExp.d (revision 42210) @@ -0,0 +1,40 @@ +TABLE fpcamRun JOIN camRun using (cam_id) JOIN chipRun ON (fpcamRun.chip_id = chipRun.chip_id) JOIN rawExp using (exp_id) +TITLE Forced Photometry on Camera Stage Exposures +FILE fpcamStageExp.php +MENU ipp.ffs.dat + +RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE() +UNRESTRICTED WHERE rawExp.dateobs >= CURDATE() + +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 camRun.cam_id=$camRun.cam_id +ARGS ARG4 fpcamRun.fpcam_id=$fpcamRun.fpcam_id + +OP OP1 $rawExp.ra * 57.295783 +OP OP2 $rawExp.decl * 57.295783 + +# field size format name show link to extras +FIELD rawExp.exp_name, 10, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fpcamRun.fpcam_id, 5, %d, FPCam ID, value, fpcamProcessedExp.php, ARG4 +FIELD fpcamRun.state, 5, %s, state +FIELD fpcamRun.label, 5, %s, label +FIELD fpcamRun.data_group, 5, %s, data grp +FIELD fpcamRun.dist_group, 5, %s, dist grp +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 19, %T, Date/Time +FIELD rawExp.ra, 8, %C, RA, op=OP1 +FIELD rawExp.decl, 8, %C, 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.comment, 65, %s, Comment + +# FIELD rawExp.bg_mean_stdev, 5, %.2f, <backgnd> Index: branches/eam_branches/ipp-20220316/ippMonitor/raw/ipp.ffs.dat =================================================================== --- branches/eam_branches/ipp-20220316/ippMonitor/raw/ipp.ffs.dat (revision 42209) +++ branches/eam_branches/ipp-20220316/ippMonitor/raw/ipp.ffs.dat (revision 42210) @@ -9,3 +9,6 @@ menulink | menuselect | link | Full Force Failed | failedFullforce.php - +menutop | menutop | plain |   | +menulink | menuselect | link | Forced Phot Camera Exp | fpcamStageExp.php +menulink | menuselect | link | Forced Phot Camera Pending | fpcamPendingExp.php +menulink | menuselect | link | Forced Phot Camera Processed Exp | fpcamProcessedExp.php Index: branches/eam_branches/ipp-20220316/ippMonitor/raw/ipp.ffs.php =================================================================== --- branches/eam_branches/ipp-20220316/ippMonitor/raw/ipp.ffs.php (revision 42209) +++ branches/eam_branches/ipp-20220316/ippMonitor/raw/ipp.ffs.php (revision 42210) @@ -8,5 +8,5 @@ if (! $ID['proj']) { projectform ($ID); } -menu('ipp.ffs.dat', 'Full Force Steps', 'ipp.css', $ID['link'], $ID['proj']); +menu('ipp.ffs.dat', 'Forced Photometry Steps', 'ipp.css', $ID['link'], $ID['proj']); // document body