Index: trunk/ippMonitor/def/calDB.d =================================================================== --- trunk/ippMonitor/def/calDB.d (revision 16617) +++ trunk/ippMonitor/def/calDB.d (revision 16617) @@ -0,0 +1,9 @@ +TABLE calDB +TITLE calDB +FILE calDB.php +MENU ipp.cal.dat + +# field size format name show link to extras +FIELD cal_id, 20, %s, calibration ID +FIELD dvodb, 20, %s, DVO database +FIELD state, 20, %s, state Index: trunk/ippMonitor/def/calRun.d =================================================================== --- trunk/ippMonitor/def/calRun.d (revision 16617) +++ trunk/ippMonitor/def/calRun.d (revision 16617) @@ -0,0 +1,10 @@ +TABLE calRun +TITLE calRun +FILE calRun.php +MENU ipp.cal.dat + +# field size format name show link to extras +FIELD cal_id, 20, %s, calibration ID +FIELD region, 20, %s, region +FIELD last_step, 20, %s, late calibration +FIELD state, 20, %s, state Index: trunk/ippMonitor/def/camPendingExp.d =================================================================== --- trunk/ippMonitor/def/camPendingExp.d (revision 16568) +++ trunk/ippMonitor/def/camPendingExp.d (revision 16617) @@ -16,6 +16,6 @@ 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, cam ID -FIELD camRun.cam_id, 5, %s, chip ID, value, chipProcessedExp.php, ARG1 +FIELD chipRun.chip_id, 5, %s, chip ID, value, chipProcessedExp.php, ARG1 +FIELD camRun.cam_id, 5, %s, cam ID FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: trunk/ippMonitor/def/camProcessedExp_NoImages.d =================================================================== --- trunk/ippMonitor/def/camProcessedExp_NoImages.d (revision 16568) +++ trunk/ippMonitor/def/camProcessedExp_NoImages.d (revision 16617) @@ -10,4 +10,5 @@ WHERE camProcessedExp.cam_id = camRun.cam_id WHERE camProcessedExp.chip_id = camRun.chip_id +WHERE camProcessedExp.fault = 0 # define image names to be used below Index: trunk/ippMonitor/def/camProcessedExp_failure.d =================================================================== --- trunk/ippMonitor/def/camProcessedExp_failure.d (revision 16617) +++ trunk/ippMonitor/def/camProcessedExp_failure.d (revision 16617) @@ -0,0 +1,52 @@ +TABLE camRun, camProcessedExp, chipRun, rawExp +TITLE Camera Processed (No Images) +FILE camProcessedExp_NoImages.php +MENU ipp.science.dat + +# the following WHERE clauses are added to all queries joined by AND +WHERE camRun.state = 'stop' +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id +WHERE camProcessedExp.cam_id = camRun.cam_id +WHERE camProcessedExp.chip_id = camRun.chip_id +WHERE camProcessedExp.fault != 0 + +# define image names to be used below +# IMAGE VAR basename filerule camera class_id +# IMAGE JPEG2 $camProcessedExp.path_base PPIMAGE.JPEG2 $rawExp.camera NONE + +# define the arguments supplied to the links below (if any) +ARGS ARG1 chipRun.exp_id=$chipRun.exp_id + +ARGS ARG2 camRun.cam_id=$camRun.cam_id +ARGS ARG2 rawExp.exp_id=$rawExp.exp_id +ARGS ARG2 camera=$rawExp.camera +ARGS ARG2 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 chipRun.exp_id, 5, %s, Exp 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 +FIELD camRun.cam_id, 5, %s, cam ID, value, chipProcessedExp.php, ARG1 +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.filter, 10, %s, FILTER +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.exp_time, 5, %s, exp_time +FIELD rawExp.airmass, 5, %s, airmass +FIELD camRun.reduction, 5, %s, reduction +FIELD camProcessedExp.bg, 5, %s, backgnd +FIELD camProcessedExp.bg_stdev, 5, %s, stdev +FIELD camProcessedExp.bg_mean_stdev, 5, %s, <backgnd> +FIELD camProcessedExp.n_stars, 5, %s, Nstars +FIELD camProcessedExp.n_astrom, 5, %s, Nastrom +FIELD camProcessedExp.sigma_ra, 5, %s, sigma ra +FIELD camProcessedExp.fwhm_major, 5, %s, FHWM (major) +FIELD camProcessedExp.path_base, 5, %s, path_base, none +FIELD rawExp.exp_id, 5, %s, Exp ID, none Index: trunk/ippMonitor/def/chipProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/chipProcessedImfile.d (revision 16568) +++ trunk/ippMonitor/def/chipProcessedImfile.d (revision 16617) @@ -8,4 +8,5 @@ WHERE chipProcessedImfile.exp_id = chipRun.exp_id WHERE chipProcessedImfile.chip_id = chipRun.chip_id +WHERE chipProcessedImfile.fault = 0 ARGS ARG1 exp_id=$chipRun.exp_id Index: trunk/ippMonitor/def/chipProcessedImfile_failure.d =================================================================== --- trunk/ippMonitor/def/chipProcessedImfile_failure.d (revision 16617) +++ trunk/ippMonitor/def/chipProcessedImfile_failure.d (revision 16617) @@ -0,0 +1,48 @@ +TABLE chipRun, rawExp, chipProcessedImfile +TITLE chip Processed Imfile +FILE chipProcessedImfile.php +MENU ipp.science.dat + +# limit this table to non-OBJECT types of images +WHERE chipRun.exp_id = rawExp.exp_id +WHERE chipProcessedImfile.exp_id = chipRun.exp_id +WHERE chipProcessedImfile.chip_id = chipRun.chip_id +WHERE chipProcessedImfile.fault != 0 + +ARGS ARG1 exp_id=$chipRun.exp_id + +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG2 camera=$rawExp.camera +ARGS ARG2 basename=$chipProcessedImfile.path_base +ARGS ARG2 class=$chipProcessedImfile.class_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, Exp ID, value, rawImfile.php, ARG1 +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, %s, chip ID +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.filter, 10, %s, FILTER +FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 +FIELD rawExp.object, 8, %s, Object +FIELD rawExp.filter, 8, %s, Filter +FIELD rawExp.exp_time, 5, %s, exp_time +FIELD rawExp.airmass, 5, %s, airmass +FIELD chipProcessedImfile.bg, 5, %s, backgnd +FIELD chipProcessedImfile.bg_stdev, 5, %s, stdev +FIELD chipProcessedImfile.n_stars, 5, %s, Nstars +FIELD chipProcessedImfile.n_astrom, 5, %s, Nastrom +FIELD chipProcessedImfile.sigma_ra, 5, %s, sigma ra +FIELD chipProcessedImfile.fwhm_major, 5, %s, FHWM +FIELD chipProcessedImfile.path_base, 5, %s, path_base, none +# FIELD chipPendingExp.reduction, 20, %s, reduction +# FIELD chipPendingExp.guide_id, 20, %s, guide ID +# FIELD chipProcessedImfile.bg_mean_stdev, 5, %s, <backgnd> + +TAIL PHP insert_log ('LOG.IMFILE'); Index: trunk/ippMonitor/def/flatcorrExp.d =================================================================== --- trunk/ippMonitor/def/flatcorrExp.d (revision 16617) +++ trunk/ippMonitor/def/flatcorrExp.d (revision 16617) @@ -0,0 +1,8 @@ +TABLE flatcorrExp +TITLE flatcorrExp +FILE flatcorrExp.php +MENU ipp.detrend.dat + +# field size format name show link to extras +FIELD corr_id, 20, %s, correction ID +FIELD chip_id, 20, %s, chip ID Index: trunk/ippMonitor/def/flatcorrRun.d =================================================================== --- trunk/ippMonitor/def/flatcorrRun.d (revision 16617) +++ trunk/ippMonitor/def/flatcorrRun.d (revision 16617) @@ -0,0 +1,13 @@ +TABLE flatcorrRun +TITLE flatcorrRun +FILE flatcorrRun.php +MENU ipp.detrend.dat + +# field size format name show link to extras +FIELD corr_id, 20, %s, correction ID +FIELD dvodb, 20, %s, dvodb +FIELD filter, 20, %s, filter +FIELD state, 20, %s, state +FIELD workdir, 20, %s, workdir +FIELD label, 20, %s, label +FIELD stats, 20, %s, stats Index: trunk/ippMonitor/def/newExp.d =================================================================== --- trunk/ippMonitor/def/newExp.d (revision 16568) +++ trunk/ippMonitor/def/newExp.d (revision 16617) @@ -2,5 +2,5 @@ TITLE New Exposures FILE newExp.php -MENU ipp.copy.dat +MENU ipp.load.dat WHERE state != 'stop' Index: trunk/ippMonitor/def/newImfile.d =================================================================== --- trunk/ippMonitor/def/newImfile.d (revision 16568) +++ trunk/ippMonitor/def/newImfile.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Raw Science Exposures FILE newImfile.php -MENU ipp.copy.dat +MENU ipp.load.dat # field size format name show link to extras Index: trunk/ippMonitor/def/pzDoneExp.d =================================================================== --- trunk/ippMonitor/def/pzDoneExp.d (revision 16568) +++ trunk/ippMonitor/def/pzDoneExp.d (revision 16617) @@ -2,5 +2,5 @@ TITLE done exposures FILE pzDoneExp.php -MENU ipp.copy.dat +MENU ipp.load.dat WHERE pzDoneExp.exp_name = summitExp.exp_name Index: trunk/ippMonitor/def/pzDoneExp_failed.d =================================================================== --- trunk/ippMonitor/def/pzDoneExp_failed.d (revision 16568) +++ trunk/ippMonitor/def/pzDoneExp_failed.d (revision 16617) @@ -2,5 +2,5 @@ TITLE done exposures FILE pzDoneExp.php -MENU ipp.copy.dat +MENU ipp.load.dat WHERE pzDoneExp.exp_name = summitExp.exp_name Index: trunk/ippMonitor/def/pzDoneImfile.d =================================================================== --- trunk/ippMonitor/def/pzDoneImfile.d (revision 16568) +++ trunk/ippMonitor/def/pzDoneImfile.d (revision 16617) @@ -2,5 +2,5 @@ TITLE done exposures FILE pzDoneImfile.php -MENU ipp.copy.dat +MENU ipp.load.dat WHERE pzDoneImfile.exp_name = summitImfile.exp_name Index: trunk/ippMonitor/def/pzDoneImfile_failed.d =================================================================== --- trunk/ippMonitor/def/pzDoneImfile_failed.d (revision 16568) +++ trunk/ippMonitor/def/pzDoneImfile_failed.d (revision 16617) @@ -2,5 +2,5 @@ TITLE failed summit copy imfiles FILE pzDoneImfile_failed.php -MENU ipp.copy.dat +MENU ipp.load.dat WHERE pzDoneExp.exp_name = summitExp.exp_name Index: trunk/ippMonitor/def/pzPendingExp.d =================================================================== --- trunk/ippMonitor/def/pzPendingExp.d (revision 16568) +++ trunk/ippMonitor/def/pzPendingExp.d (revision 16617) @@ -2,5 +2,5 @@ TITLE pending exposures FILE pzPendingExp.php -MENU ipp.copy.dat +MENU ipp.load.dat WHERE pzPendingExp.exp_name = summitExp.exp_name Index: trunk/ippMonitor/def/pzPendingImfile.d =================================================================== --- trunk/ippMonitor/def/pzPendingImfile.d (revision 16568) +++ trunk/ippMonitor/def/pzPendingImfile.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Pending Image Files FILE pzPendingImfile.php -MENU ipp.copy.dat +MENU ipp.load.dat # field size format name show link to extras Index: trunk/ippMonitor/def/rawDetrendExp.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp.d (revision 16568) +++ trunk/ippMonitor/def/rawDetrendExp.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Raw Detrend Exposures FILE rawDetrendExp.php -MENU ipp.copy.dat +MENU ipp.load.dat # limit this table to non-OBJECT types of images Index: trunk/ippMonitor/def/rawExp.d =================================================================== --- trunk/ippMonitor/def/rawExp.d (revision 16568) +++ trunk/ippMonitor/def/rawExp.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Raw Exposures FILE rawExp.php -MENU ipp.copy.dat +MENU ipp.load.dat ARGS ARG1 exp_id=$exp_id Index: trunk/ippMonitor/def/rawExp_failed.d =================================================================== --- trunk/ippMonitor/def/rawExp_failed.d (revision 16568) +++ trunk/ippMonitor/def/rawExp_failed.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Failed Raw Exposures FILE rawExp_failed.php -MENU ipp.copy.dat +MENU ipp.load.dat # limit this table to non-OBJECT types of images Index: trunk/ippMonitor/def/rawImfile_failed.d =================================================================== --- trunk/ippMonitor/def/rawImfile_failed.d (revision 16568) +++ trunk/ippMonitor/def/rawImfile_failed.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Failed Raw Image Files FILE rawImfile.php -MENU ipp.copy.dat +MENU ipp.load.dat HEAD PHP insert_backref ("rawExp.php", "exp_id", $ID['link']); Index: trunk/ippMonitor/def/rawScienceExp.d =================================================================== --- trunk/ippMonitor/def/rawScienceExp.d (revision 16568) +++ trunk/ippMonitor/def/rawScienceExp.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Raw Science Exposures FILE rawScienceExp.php -MENU ipp.copy.dat +MENU ipp.load.dat # limit this table to OBJECT types of images Index: trunk/ippMonitor/def/rawUnknownExp.d =================================================================== --- trunk/ippMonitor/def/rawUnknownExp.d (revision 16568) +++ trunk/ippMonitor/def/rawUnknownExp.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Raw Unknown Exposures FILE rawUnknownExp.php -MENU ipp.copy.dat +MENU ipp.load.dat # limit this table to non-OBJECT types of images Index: trunk/ippMonitor/def/summitExp.d =================================================================== --- trunk/ippMonitor/def/summitExp.d (revision 16568) +++ trunk/ippMonitor/def/summitExp.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Pending Summit Exposures FILE summitExp.php -MENU ipp.copy.dat +MENU ipp.load.dat # field size, format name show link to extras Index: trunk/ippMonitor/def/summitImfile.d =================================================================== --- trunk/ippMonitor/def/summitImfile.d (revision 16568) +++ trunk/ippMonitor/def/summitImfile.d (revision 16617) @@ -2,5 +2,5 @@ TITLE Summit Image Files FILE summitImfile.php -MENU ipp.copy.dat +MENU ipp.load.dat # field size format name show link to extras