Index: trunk/ippMonitor/def/camPendingExp.d =================================================================== --- trunk/ippMonitor/def/camPendingExp.d (revision 15971) +++ trunk/ippMonitor/def/camPendingExp.d (revision 15992) @@ -10,19 +10,23 @@ 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 camRun.cam_id, 5, %s, chip ID, value, chipProcessedExp.php, ARG1 -FIELD chipRun.chip_id, 5, %s, cam ID 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 rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 10, %s, 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.ra, 5, %s, RA -FIELD rawExp.decl, 5, %s, Dec FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.sat_pixel_frac, 5, %s, f(sat pixels) FIELD rawExp.airmass, 5, %s, airmass FIELD rawExp.bg, 5, %s, backgnd FIELD rawExp.bg_stdev, 5, %s, stdev FIELD rawExp.bg_mean_stdev, 5, %s, <backgnd> +FIELD rawExp.sat_pixel_frac, 5, %s, f(sat pixels) Index: trunk/ippMonitor/def/camProcessedExp.d =================================================================== --- trunk/ippMonitor/def/camProcessedExp.d (revision 15971) +++ trunk/ippMonitor/def/camProcessedExp.d (revision 15992) @@ -23,7 +23,10 @@ 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.exp_id, 5, %s, Exp ID, value, chipProcessedImfile.php, ARG1 FIELD chipRun.chip_id, 5, %s, chip ID FIELD camRun.cam_id, 5, %s, cam ID, value, chipProcessedExp.php, ARG1 @@ -32,9 +35,9 @@ FIELD rawExp.camera, 10, %s, Camera FIELD rawExp.dateobs, 20, %s, 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.ra, 5, %s, RA -FIELD rawExp.decl, 5, %s, Dec FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.sat_pixel_frac, 5, %s, f(sat pixels) FIELD rawExp.airmass, 5, %s, airmass FIELD camRun.reduction, 5, %s, reduction @@ -48,2 +51,4 @@ 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 Index: trunk/ippMonitor/def/camProcessedExp_NoImages.d =================================================================== --- trunk/ippMonitor/def/camProcessedExp_NoImages.d (revision 15971) +++ trunk/ippMonitor/def/camProcessedExp_NoImages.d (revision 15992) @@ -23,7 +23,10 @@ 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.exp_id, 5, %s, Exp ID, value, chipProcessedImfile.php, ARG1 FIELD chipRun.chip_id, 5, %s, chip ID FIELD camRun.cam_id, 5, %s, cam ID, value, chipProcessedExp.php, ARG1 @@ -32,8 +35,8 @@ FIELD rawExp.dateobs, 20, %s, Date/Time FIELD rawExp.filter, 10, %s, FILTER -FIELD rawExp.ra, 5, %s, RA -FIELD rawExp.decl, 5, %s, Dec +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.sat_pixel_frac, 5, %s, f(sat pixels) FIELD rawExp.airmass, 5, %s, airmass FIELD camRun.reduction, 5, %s, reduction Index: trunk/ippMonitor/def/chipPendingExp.d =================================================================== --- trunk/ippMonitor/def/chipPendingExp.d (revision 15971) +++ trunk/ippMonitor/def/chipPendingExp.d (revision 15992) @@ -13,22 +13,21 @@ # field size format name show link to extras -FIELD chipRun.chip_id, 7, %s, chip ID FIELD chipRun.exp_id, 5, %s, Exp ID FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +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, 5, %10.6f, RA, op=OP1 FIELD rawExp.decl, 5, %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.sat_pixel_frac, 5, %6.4f, f(sat pixels) FIELD rawExp.airmass, 5, %s, airmass FIELD rawExp.bg, 5, %8.2f, backgnd FIELD rawExp.bg_stdev, 5, %7.2f, stdev -FIELD rawExp.bg_mean_stdev, 5, %7.2f, <backgnd> FIELD rawExp.comment, 5, %s, CMMTOBS - +# 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/chipProcessedExp.d =================================================================== --- trunk/ippMonitor/def/chipProcessedExp.d (revision 15971) +++ trunk/ippMonitor/def/chipProcessedExp.d (revision 15992) @@ -11,21 +11,25 @@ ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +OP OP1 $rawExp.ra * 57.295783 +OP OP2 $rawExp.decl * 57.295783 + # field size format name show link to extras -FIELD chipRun.chip_id, 7, %s, chip ID 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 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.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.ra, 5, %s, RA -FIELD rawExp.decl, 5, %s, Dec FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.sat_pixel_frac, 5, %s, f(sat pixels) FIELD rawExp.airmass, 5, %s, airmass FIELD rawExp.bg, 5, %s, backgnd FIELD rawExp.bg_stdev, 5, %s, stdev -FIELD rawExp.bg_mean_stdev, 5, %s, <backgnd> +# FIELD rawExp.bg_mean_stdev, 5, %s, <backgnd> +# FIELD rawExp.sat_pixel_frac, 5, %s, f(sat pixels) # FIELD chipPendingExp.reduction, 20, reduction # FIELD chipPendingExp.guide_id, 20, guide ID Index: trunk/ippMonitor/def/chipProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/chipProcessedImfile.d (revision 15971) +++ trunk/ippMonitor/def/chipProcessedImfile.d (revision 15992) @@ -16,21 +16,24 @@ 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 chipRun.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 -FIELD chipProcessedImfile.class_id, 5, %s, Class ID -FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile.php, ARG2 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, 5, %s, RA -FIELD rawExp.decl, 5, %s, Dec +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.sat_pixel_frac, 5, %s, f(sat pixels) FIELD rawExp.airmass, 5, %s, airmass FIELD chipProcessedImfile.bg, 5, %s, backgnd FIELD chipProcessedImfile.bg_stdev, 5, %s, stdev -FIELD chipProcessedImfile.bg_mean_stdev, 5, %s, <backgnd> FIELD chipProcessedImfile.n_stars, 5, %s, Nstars FIELD chipProcessedImfile.n_astrom, 5, %s, Nastrom @@ -40,4 +43,5 @@ # 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/rawDetrendExp.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp.d (revision 15971) +++ trunk/ippMonitor/def/rawDetrendExp.d (revision 15992) @@ -9,26 +9,16 @@ ARGS ARG1 exp_id=$exp_id -# field size format name show link to extras -FIELD exp_id, 5, %s, Exp ID -FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, %s, Telescope -FIELD camera, 10, %s, Camera -FIELD exp_type, 10, %s, Type -FIELD filter, 10, %s, FILTER -FIELD dateobs, 20, %s, Date/Time -FIELD exp_time, 5, %s, exp_time -FIELD sat_pixel_frac, 5, %s, f(sat pixels) -FIELD airmass, 5, %s, airmass -FIELD bg, 5, %s, backgnd -FIELD bg_stdev, 5, %s, stdev -FIELD bg_mean_stdev, 5, %s, <backgnd> -# FIELD ra, 8, %s, ra -# FIELD decl, 8, %s, decl -# FIELD object, 10, %s, object -# FIELD imfiles, 20, %s, imfiles -# FIELD airmass, 20, %s, airmass -# FIELD bg_mean_stdev, 20, %s, bg_mean_stdev -# FIELD alt, 20, %s, alt -# FIELD az, 20, %s, az -# FIELD ccd_temp, 20, %s, ccd_temp -# FIELD posang, 20, %s, posang +# field size format name show link to extras +FIELD exp_id, 5, %s, Exp ID +FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD telescope, 10, %s, Telescope +FIELD camera, 10, %s, Camera +FIELD exp_type, 10, %s, Type +FIELD filter, 10, %s, FILTER +FIELD dateobs, 20, %s, Date/Time +FIELD exp_time, 5, %s, exp_time +FIELD sat_pixel_frac, 5, %s, f(sat pixels) +FIELD airmass, 5, %s, airmass +FIELD bg, 5, %s, backgnd +FIELD bg_stdev, 5, %s, stdev +FIELD bg_mean_stdev, 5, %s, <backgnd> Index: trunk/ippMonitor/def/rawDetrendExp_detrend.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp_detrend.d (revision 15971) +++ trunk/ippMonitor/def/rawDetrendExp_detrend.d (revision 15992) @@ -9,28 +9,16 @@ ARGS ARG1 exp_id=$exp_id -# field size format name show link to extras -FIELD exp_id, 5, %s, Exp ID -FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, %s, Telescope -FIELD camera, 10, %s, Camera -FIELD exp_type, 10, %s, Type -FIELD filter, 10, %s, FILTER -FIELD dateobs, 20, %s, Date/Time -FIELD exp_time, 5, %s, exp_time -FIELD sat_pixel_frac, 5, %s, f(sat pixels) -FIELD airmass, 5, %s, airmass -FIELD bg, 5, %s, backgnd -FIELD bg_stdev, 5, %s, stdev -FIELD bg_mean_stdev, 5, %s, <backgnd> -# FIELD imfiles, 20, %s, imfiles -# FIELD airmass, 20, %s, airmass -# FIELD ra, 20, %s, ra -# FIELD decl, 20, %s, decl -# FIELD exp_time, 20, %s, exp_time -# FIELD bg, 20, %s, bg -# FIELD bg_stdev, 20, %s, bg_stdev -# FIELD bg_mean_stdev, 20, bg_mean_stdev -# FIELD alt, 20, alt -# FIELD az, 20, az -# FIELD ccd_temp, 20, ccd_temp -# FIELD posang, 20, posang +# field size format name show link to extras +FIELD exp_id, 5, %s, Exp ID +FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD telescope, 10, %s, Telescope +FIELD camera, 10, %s, Camera +FIELD exp_type, 10, %s, Type +FIELD filter, 10, %s, FILTER +FIELD dateobs, 20, %s, Date/Time +FIELD exp_time, 5, %s, exp_time +FIELD sat_pixel_frac, 5, %s, f(sat pixels) +FIELD airmass, 5, %s, airmass +FIELD bg, 5, %s, backgnd +FIELD bg_stdev, 5, %s, stdev +FIELD bg_mean_stdev, 5, %s, <backgnd> Index: trunk/ippMonitor/def/rawExp.d =================================================================== --- trunk/ippMonitor/def/rawExp.d (revision 15971) +++ trunk/ippMonitor/def/rawExp.d (revision 15992) @@ -6,4 +6,7 @@ ARGS ARG1 exp_id=$exp_id +OP OP1 $ra * 57.295783 +OP OP2 $decl * 57.295783 + # field size format name show link to extras FIELD exp_id, 5, %s, Exp ID @@ -12,8 +15,9 @@ FIELD camera, 10, %s, Camera FIELD exp_type, 8, %s, Type +FIELD dateobs, 8, %s, Date/Time +FIELD ra, 8, %10.6f, RA, op=OP1 +FIELD decl, 8, %10.6f, DEC, op=OP2 +FIELD object, 10, %s, object FIELD filter, 10, %s, FILTER -FIELD ra, 8, %s, ra -FIELD decl, 8, %s, decl -FIELD object, 10, %s, object FIELD airmass, 5, %s, airmass FIELD exp_time, 5, %s, exp_time Index: trunk/ippMonitor/def/rawExp_failed.d =================================================================== --- trunk/ippMonitor/def/rawExp_failed.d (revision 15971) +++ trunk/ippMonitor/def/rawExp_failed.d (revision 15992) @@ -6,6 +6,10 @@ # limit this table to non-OBJECT types of images WHERE fault > 0 +WHERE rawExp.exp_type = 'OBJECT' ARGS ARG1 exp_id=$exp_id + +OP OP1 $ra * 57.295783 +OP OP2 $decl * 57.295783 # field size format name show link to extras @@ -14,5 +18,6 @@ FIELD telescope, 10, %s, Telescope FIELD camera, 10, %s, Camera -FIELD exp_type, 10, %s, Type +FIELD ra, 8, %10.6f, RA, op=OP1 +FIELD decl, 8, %10.6f, DEC, op=OP2 FIELD filter, 10, %s, FILTER FIELD dateobs, 20, %s, Date/Time Index: trunk/ippMonitor/def/rawImfile.d =================================================================== --- trunk/ippMonitor/def/rawImfile.d (revision 15971) +++ trunk/ippMonitor/def/rawImfile.d (revision 15992) @@ -6,19 +6,23 @@ HEAD PHP insert_backref ("rawExp.php", "exp_id", $ID['link']); +OP OP1 $ra * 57.295783 +OP OP2 $decl * 57.295783 + # field size format name show link to extras FIELD exp_id, 5, %s, Exp ID FIELD exp_name, 5, %s, Exposure FIELD class_id, 8, %s, Chip ID +FIELD ra, 8, %10.6f, RA, op=OP1 +FIELD decl, 8, %10.6f, DEC, op=OP2 +FIELD object, 8, %s, object +FIELD filter, 8, %s, FILTER +FIELD airmass, 5, %s, airmass +FIELD exp_time, 5, %s, exp_time FIELD bg, 8, %s, backgnd FIELD bg_stdev, 8, %s, stdev FIELD bg_mean_stdev, 8, %s, [stdev] +FIELD exp_type, 8, %s, exp_type FIELD uri, 10, %s, uri -# FIELD class, 20, %s, Class -# FIELD uri, 20, uri -# FIELD exp_type, 20, exp_type -# FIELD filter, 20, filter # FIELD airmass, 20, airmass -# FIELD ra, 20, ra -# FIELD decl, 20, decl # FIELD exp_time, 20, exp_time # FIELD alt, 20, alt Index: trunk/ippMonitor/def/rawImfile_failed.d =================================================================== --- trunk/ippMonitor/def/rawImfile_failed.d (revision 15971) +++ trunk/ippMonitor/def/rawImfile_failed.d (revision 15992) @@ -7,8 +7,13 @@ WHERE fault > 0 +OP OP1 $ra * 57.295783 +OP OP2 $decl * 57.295783 + # field size format name show link to extras FIELD exp_id, 5, %s, Exp ID FIELD exp_name, 5, %s, Exposure FIELD class_id, 8, %s, Chip ID +FIELD ra, 8, %10.6f, RA, op=OP1 +FIELD decl, 8, %10.6f, DEC, op=OP2 FIELD bg, 8, %s, backgnd FIELD bg_stdev, 8, %s, stdev Index: trunk/ippMonitor/def/rawScienceExp.d =================================================================== --- trunk/ippMonitor/def/rawScienceExp.d (revision 15971) +++ trunk/ippMonitor/def/rawScienceExp.d (revision 15992) @@ -14,14 +14,14 @@ # field size format name show link to extras FIELD exp_id, 5, %s, Exp ID -FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, %s, Telescope -FIELD camera, 10, %s, Camera -FIELD exp_type, 8, %s, Type -FIELD filter, 10, %s, FILTER +FIELD exp_name, 8, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD telescope, 8, %s, Telescope +FIELD camera, 8, %s, Camera +FIELD dateobs, 8, %s, Date/Time FIELD ra, 8, %10.6f, RA, op=OP1 FIELD decl, 8, %10.6f, DEC, op=OP2 -FIELD object, 10, %s, object +FIELD object, 8, %s, object +FIELD filter, 8, %s, FILTER +FIELD exp_time, 5, %s, exp_time FIELD airmass, 5, %s, airmass -FIELD exp_time, 5, %s, exp_time FIELD bg, 5, %s, bg FIELD bg_stdev, 5, %s, bg_stdev @@ -32,2 +32,3 @@ # FIELD ccd_temp, 20, ccd_temp # FIELD posang, 20, posang +# FIELD exp_type, 8, %s, Type Index: trunk/ippMonitor/def/rawUnknownExp.d =================================================================== --- trunk/ippMonitor/def/rawUnknownExp.d (revision 15971) +++ trunk/ippMonitor/def/rawUnknownExp.d (revision 15992) @@ -9,20 +9,25 @@ ARGS ARG1 exp_id=$exp_id +OP OP1 $ra * 57.295783 +OP OP2 $decl * 57.295783 + # field size format name show link to extras FIELD exp_id, 5, %s, Exp ID FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD exp_type, 8, %s, Type FIELD telescope, 10, %s, Telescope FIELD camera, 10, %s, Camera -FIELD exp_type, 10, %s, Type +FIELD dateobs, 20, %s, Date/Time +FIELD ra, 8, %10.6f, RA, op=OP1 +FIELD decl, 8, %10.6f, DEC, op=OP2 +FIELD object, 8, %s, object FIELD filter, 10, %s, FILTER -FIELD dateobs, 20, %s, Date/Time FIELD exp_time, 5, %s, exp_time FIELD airmass, 5, %s, airmass FIELD bg, 5, %s, backgnd FIELD bg_stdev, 5, %s, stdev -FIELD bg_mean_stdev, 5, %s, <backgnd> +# FIELD bg_mean_stdev, 5, %s, <backgnd> # FIELD ra, 8, %s, ra # FIELD decl, 8, %s, decl -# FIELD object, 10, %s, object # FIELD imfiles, 20, %s, imfiles # FIELD airmass, 20, %s, airmass Index: trunk/ippMonitor/def/stackInputSkyfile.d =================================================================== --- trunk/ippMonitor/def/stackInputSkyfile.d (revision 15971) +++ trunk/ippMonitor/def/stackInputSkyfile.d (revision 15992) @@ -1,8 +1,32 @@ -TABLE stackInputSkyfile +TABLE stackInputSkyfile, warpInputExp, camProcessedExp, chipRun, rawExp TITLE stackInputSkyfile FILE stackInputSkyfile.php MENU ipp.stack.dat -# field size format name show link to extras -FIELD stack_id, 5, %s, stack ID -FIELD warp_id, 5, %s, warp ID +WHERE stackInputSkyfile.warp_id = warpInputExp.warp_id +WHERE warpInputExp.cam_id = camProcessedExp.cam_id +WHERE camProcessedExp.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.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, Exp ID +FIELD rawExp.exp_name, 8, %s, Exp Name +FIELD chipRun.chip_id, 5, %s, Chip ID +FIELD camProcessedExp.cam_id, 5, %s, Cam ID +FIELD warpInputExp.warp_id, 5, %s, Warp ID +FIELD stackInputSkyfile.stack_id, 5, %s, stack ID +FIELD warpInputExp.magiced, 5, %s, magic? +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 20, %s, Date/Time +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, exptime +FIELD rawExp.airmass, 5, %s, airmass +FIELD rawExp.bg, 5, %s, bg +FIELD rawExp.bg_stdev, 5, %s, bg_stdev Index: trunk/ippMonitor/def/warpInputExp.d =================================================================== --- trunk/ippMonitor/def/warpInputExp.d (revision 15971) +++ trunk/ippMonitor/def/warpInputExp.d (revision 15992) @@ -8,9 +8,23 @@ WHERE chipRun.exp_id = rawExp.exp_id +OP OP1 $rawExp.ra * 57.295783 +OP OP2 $rawExp.decl * 57.295783 + # field size format name show link to extras -FIELD rawExp.exp_tag, 5, %s, Exp Tag -FIELD chipRun.exp_id, 5, %s, Exp ID -FIELD chipRun.chip_id, 5, %s, Chip ID +FIELD chipRun.exp_id, 5, %s, Exp ID +FIELD rawExp.exp_name, 8, %s, Exp Name +FIELD chipRun.chip_id, 5, %s, Chip ID FIELD camProcessedExp.cam_id, 5, %s, Cam ID -FIELD warpInputExp.warp_id, 5, %s, Warp ID +FIELD warpInputExp.warp_id, 5, %s, Warp ID FIELD warpInputExp.magiced, 5, %s, magic? +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 20, %s, Date/Time +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, exptime +FIELD rawExp.airmass, 5, %s, airmass +FIELD rawExp.bg, 5, %s, bg +FIELD rawExp.bg_stdev, 5, %s, bg_stdev Index: trunk/ippMonitor/raw/ipp.science.dat =================================================================== --- trunk/ippMonitor/raw/ipp.science.dat (revision 15971) +++ trunk/ippMonitor/raw/ipp.science.dat (revision 15992) @@ -30,5 +30,6 @@ menulink | menuselect | link | Chip Processed Exp | chipProcessedExp.php menulink | menuselect | link | Chip Processed Imfiles | chipProcessedImfile.php -menulink | menuselect | link | Cam Processed Exp | camProcessedExp.php +menulink | menuselect | link | Cam Processed Exp | camProcessedExp_NoImages.php +menulink | menuselect | link | Cam Proc. Exp w/ Images | camProcessedExp.php menutop | menutop | plain |   | menutop | menuselect | plain | Guide Pending Exp | guidePendingExp.php