Index: /trunk/ippMonitor/Makefile.in =================================================================== --- /trunk/ippMonitor/Makefile.in (revision 19083) +++ /trunk/ippMonitor/Makefile.in (revision 19084) @@ -83,4 +83,10 @@ $(DESTWWW)/camProcessedExp_failure.php \ $(DESTWWW)/camProcessedImfile.php \ +$(DESTWWW)/fakeStageExp.php \ +$(DESTWWW)/fakePendingExp.php \ +$(DESTWWW)/fakeProcessedExp.php \ +$(DESTWWW)/fakePendingImfile.php \ +$(DESTWWW)/fakeProcessedImfile.php \ +$(DESTWWW)/fakeProcessedImfile_failure.php \ $(DESTWWW)/pzPendingExp.php \ $(DESTWWW)/pzPendingImfile.php \ @@ -99,8 +105,9 @@ $(DESTWWW)/summitExp.php \ $(DESTWWW)/summitImfile.php \ -$(DESTWWW)/warpRun.php \ -$(DESTWWW)/warpInputExp.php \ -$(DESTWWW)/warpSkycellMap.php \ -$(DESTWWW)/warpSkyfile.php \ +$(DESTWWW)/warpStageExp.php \ +$(DESTWWW)/warpStageSkyfiles.php \ +$(DESTWWW)/warpStageSkyfileInputs.php \ +$(DESTWWW)/warpProcessedSkyfiles.php \ +$(DESTWWW)/warpFailedSkyfiles.php \ $(DESTWWW)/diffRun.php \ $(DESTWWW)/diffInputSkyfile.php \ Index: /trunk/ippMonitor/def/camPendingExp.d =================================================================== --- /trunk/ippMonitor/def/camPendingExp.d (revision 19083) +++ /trunk/ippMonitor/def/camPendingExp.d (revision 19084) @@ -8,5 +8,7 @@ WHERE chipRun.exp_id = rawExp.exp_id -ARGS ARG1 chipRun.exp_id=$chipRun.exp_id +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 @@ -14,9 +16,9 @@ # 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, value, chipProcessedExp.php, ARG1 -FIELD camRun.cam_id, 5, %s, cam ID -FIELD camRun.state, 5, %s, state +FIELD rawExp.exp_name, 10, %s, Exp Name +FIELD rawExp.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %s, Chip ID, value, chipProcessedImfile.php, ARG2 +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 Index: /trunk/ippMonitor/def/camProcessedExp.d =================================================================== --- /trunk/ippMonitor/def/camProcessedExp.d (revision 19083) +++ /trunk/ippMonitor/def/camProcessedExp.d (revision 19084) @@ -16,10 +16,11 @@ # define the arguments supplied to the links below (if any) -ARGS ARG1 chipRun.exp_id=$chipRun.exp_id +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 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 +ARGS ARG4 camRun.cam_id=$camRun.cam_id +ARGS ARG4 camera=$rawExp.camera +ARGS ARG4 basename=$camProcessedExp.path_base OP OP1 $rawExp.ra * 57.295783 @@ -27,9 +28,9 @@ # 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 *, 8, %s, image, image=JPEG2, camProcessedImfile.php, ARG2 +FIELD rawExp.exp_name, 10, %s, Exp Name +FIELD rawExp.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %s, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %s, Cam ID, value, camProcessedExp.php, ARG3 +FIELD *, 8, %s, image, image=JPEG2, camProcessedImfile.php, ARG4 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 19083) +++ /trunk/ippMonitor/def/camProcessedExp_NoImages.d (revision 19084) @@ -11,15 +11,12 @@ 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 rawImfile.exp_id=$rawExp.exp_id +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 camRun.cam_id=$camRun.cam_id -# 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 +ARGS ARG4 camRun.cam_id=$camRun.cam_id +ARGS ARG4 camera=$rawExp.camera +ARGS ARG4 basename=$camProcessedExp.path_base OP OP1 $rawExp.ra * 57.295783 @@ -27,9 +24,9 @@ # 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 camRun.state, 5, %s, state +FIELD rawExp.exp_name, 10, %s, Exp Name +FIELD rawExp.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %s, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %s, Cam ID, value, camProcessedExp.php, ARG3 +FIELD camRun.state, 5, %s, state, value, camProcessedImfile.php, ARG4 FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: /trunk/ippMonitor/def/camProcessedExp_failure.d =================================================================== --- /trunk/ippMonitor/def/camProcessedExp_failure.d (revision 19083) +++ /trunk/ippMonitor/def/camProcessedExp_failure.d (revision 19084) @@ -11,15 +11,12 @@ 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 rawImfile.exp_id=$rawExp.exp_id +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 camRun.cam_id=$camRun.cam_id -# 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 +ARGS ARG4 camRun.cam_id=$camRun.cam_id +ARGS ARG4 camera=$rawExp.camera +ARGS ARG4 basename=$camProcessedExp.path_base OP OP1 $rawExp.ra * 57.295783 @@ -27,9 +24,9 @@ # 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 camRun.state, 5, %s, state +FIELD rawExp.exp_name, 5, %s, Exp Name +FIELD rawExp.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %s, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %d, Cam ID, value, camProcessedExp_failure.php, ARG3 +FIELD camRun.state, 5, %s, state, value, camProcessedImfile.php, ARG4 FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: /trunk/ippMonitor/def/camProcessedImfile.d =================================================================== --- /trunk/ippMonitor/def/camProcessedImfile.d (revision 19083) +++ /trunk/ippMonitor/def/camProcessedImfile.d (revision 19084) @@ -1,5 +1,5 @@ TABLE camRun, camProcessedExp, chipRun, rawExp, chipProcessedImfile -TITLE Camera Processed -FILE camProcessedExp.php +TITLE Camera Processed Imfiles +FILE camProcessedImfile.php MENU ipp.science.dat @@ -11,11 +11,26 @@ WHERE chipProcessedImfile.chip_id = camRun.chip_id +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 camRun.cam_id, 5, %s, cam ID, value -FIELD chipRun.chip_id, 5, %s, chip ID -FIELD rawExp.exp_id, 5, %s, exposure ID, value -FIELD rawExp.exp_name, 5, %s, Exp Name, value +FIELD rawExp.exp_name, 10, %s, Exp Name, value +FIELD chipProcessedImfile.class_id, 8, %s, Class ID +FIELD rawExp.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %s, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %s, Cam ID, value, camProcessedExp.php, ARG3 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 chipProcessedImfile.bg, 5, %.2f, backgnd FIELD chipProcessedImfile.bg_stdev, 5, %.2f, stdev @@ -25,4 +40,5 @@ FIELD camProcessedExp.sigma_ra, 5, %.2f, sigma ra FIELD chipProcessedImfile.fwhm_major, 5, %.2f, FHWM (major) +FIELD rawExp.comment, 65, %s, Comment TAIL PHP insert_image ('PPIMAGE.JPEG1'); Index: /trunk/ippMonitor/def/camStageExp.d =================================================================== --- /trunk/ippMonitor/def/camStageExp.d (revision 19083) +++ /trunk/ippMonitor/def/camStageExp.d (revision 19084) @@ -7,15 +7,16 @@ WHERE chipRun.exp_id = rawExp.exp_id -ARGS ARG1 chipRun.exp_id=$chipRun.exp_id +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 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, value, chipProcessedExp.php, ARG1 -FIELD camRun.cam_id, 5, %s, cam ID +FIELD rawExp.exp_name, 10, %s, Exp Name +FIELD rawExp.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %s, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %s, Cam ID, value, camProcessedExp.php, ARG3 FIELD camRun.state, 5, %s, state FIELD rawExp.telescope, 10, %s, Telescope Index: /trunk/ippMonitor/def/chipPendingExp.d =================================================================== --- /trunk/ippMonitor/def/chipPendingExp.d (revision 19083) +++ /trunk/ippMonitor/def/chipPendingExp.d (revision 19084) @@ -8,5 +8,6 @@ WHERE chipRun.exp_id = rawExp.exp_id -ARGS ARG1 exp_id=$chipRun.exp_id +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id OP OP1 $rawExp.ra * 57.295783 @@ -14,8 +15,8 @@ # 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.exp_name, 10, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD chipRun.state, 7, %s, State FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: /trunk/ippMonitor/def/chipPendingImfile.d =================================================================== --- /trunk/ippMonitor/def/chipPendingImfile.d (revision 19083) +++ /trunk/ippMonitor/def/chipPendingImfile.d (revision 19084) @@ -12,16 +12,16 @@ WHERE rawImfile.exp_id = rawExp.exp_id - -ARGS ARG1 exp_id=$chipRun.exp_id +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id +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.exp_id, 5, %d, Exp ID -FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +# field size format name show link to extras +FIELD rawExp.exp_name, 10, %s, Exp Name FIELD rawImfile.class_id, 8, %s, Class ID -FIELD chipRun.chip_id, 7, %d, chip ID -FIELD chipRun.state, 7, %s, state +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD chipRun.state, 7, %s, State FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: /trunk/ippMonitor/def/chipProcessedExp.d =================================================================== --- /trunk/ippMonitor/def/chipProcessedExp.d (revision 19083) +++ /trunk/ippMonitor/def/chipProcessedExp.d (revision 19084) @@ -8,5 +8,5 @@ WHERE chipRun.exp_id = rawExp.exp_id -ARGS ARG1 exp_id=$chipRun.exp_id +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id ARGS ARG2 chipRun.chip_id=$chipRun.chip_id @@ -15,8 +15,8 @@ # 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 chipRun.chip_id, 7, %d, chip ID -FIELD chipRun.state, 7, %s, state +FIELD rawExp.exp_name, 5, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD chipRun.state, 7, %s, State FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: /trunk/ippMonitor/def/chipProcessedImfile.d =================================================================== --- /trunk/ippMonitor/def/chipProcessedImfile.d (revision 19083) +++ /trunk/ippMonitor/def/chipProcessedImfile.d (revision 19084) @@ -10,10 +10,13 @@ WHERE chipProcessedImfile.fault = 0 -ARGS ARG1 exp_id=$chipRun.exp_id +ARGS ARG1 rawImfile.exp_id=$rawExp.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 + +ARGS ARG3 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 chipProcessedImfile.class_id=$chipProcessedImfile.class_id +ARGS ARG3 camera=$rawExp.camera +ARGS ARG3 basename=$chipProcessedImfile.path_base +ARGS ARG3 class=$chipProcessedImfile.class_id OP OP1 $rawExp.ra * 57.295783 @@ -21,9 +24,9 @@ # 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 chipProcessedImfile.class_id, 8, %s, Class ID -FIELD chipRun.chip_id, 7, %d, chip ID -FIELD chipRun.state, 7, %s, state +FIELD rawExp.exp_name, 10, %s, Exp Name +FIELD chipProcessedImfile.class_id, 8, %s, Class ID +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD chipRun.state, 7, %s, State, value, chipProcessedImfile.php, ARG3 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 19083) +++ /trunk/ippMonitor/def/chipProcessedImfile_failure.d (revision 19084) @@ -10,21 +10,23 @@ WHERE chipProcessedImfile.fault != 0 -ARGS ARG1 exp_id=$chipRun.exp_id +ARGS ARG1 rawImfile.exp_id=$chipRun.exp_id 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 -ARGS ARG2 class=$chipProcessedImfile.class_id + +ARGS ARG3 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 chipProcessedImfile.class_id=$chipProcessedImfile.class_id +ARGS ARG3 camera=$rawExp.camera +ARGS ARG3 basename=$chipProcessedImfile.path_base +ARGS ARG3 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, %d, Exp ID, value, rawImfile.php, ARG1 -FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile_failure.php, ARG2 +# field size format name show link to extras +FIELD rawExp.exp_name, 5, %s, Exp Name FIELD chipProcessedImfile.class_id, 8, %s, Class ID -FIELD chipRun.chip_id, 7, %d, chip ID -FIELD chipRun.state, 7, %s, state +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile_failure.php, ARG2 +FIELD chipRun.state, 7, %s, State, value, chipProcessedImfile_failure.php, ARG3 FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: /trunk/ippMonitor/def/chipStageExp.d =================================================================== --- /trunk/ippMonitor/def/chipStageExp.d (revision 19083) +++ /trunk/ippMonitor/def/chipStageExp.d (revision 19084) @@ -6,14 +6,15 @@ WHERE chipRun.exp_id = rawExp.exp_id -ARGS ARG1 exp_id=$chipRun.exp_id +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id +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.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 size format name show link to extras +FIELD rawExp.exp_name, 5, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD chipRun.state, 7, %s, State FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera Index: /trunk/ippMonitor/def/fakePendingExp.d =================================================================== --- /trunk/ippMonitor/def/fakePendingExp.d (revision 19084) +++ /trunk/ippMonitor/def/fakePendingExp.d (revision 19084) @@ -0,0 +1,42 @@ +TABLE fakeRun, camRun, chipRun, rawExp +TITLE fake Pending Exposures +FILE fakePendingExp.php +MENU ipp.science.dat + +# limit this table to non-OBJECT types of images +WHERE fakeRun.state = 'new' +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id + +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 fakeRun.fake_id=$fakeRun.fake_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, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD fakeRun.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, 8, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 8, %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/fakePendingImfile.d =================================================================== --- /trunk/ippMonitor/def/fakePendingImfile.d (revision 19084) +++ /trunk/ippMonitor/def/fakePendingImfile.d (revision 19084) @@ -0,0 +1,41 @@ +TABLE fakeRun, camRun, chipRun, rawExp, rawImfile +TITLE Fake Pending Imfiles +FILE fakePendingImfile.php +MENU ipp.science.dat + +WHERE fakeRun.state = 'new' +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id +WHERE rawImfile.exp_id = rawExp.exp_id + +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 ARG3 fakeRun.fake_id=$fakeRun.fake_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 rawImfile.class_id, 8, %s, Class ID +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %s, Cam ID, alue, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 5, %s, Fake ID, value, fakeProcessedImfile.php, ARG4 +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, 8, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 8, %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 *, 5, %d, Nstars, value=0 +FIELD *, 5, %.2f, FHWM, value=0.0 +FIELD rawExp.comment, 65, %s, Comment Index: /trunk/ippMonitor/def/fakeProcessedExp.d =================================================================== --- /trunk/ippMonitor/def/fakeProcessedExp.d (revision 19084) +++ /trunk/ippMonitor/def/fakeProcessedExp.d (revision 19084) @@ -0,0 +1,43 @@ +TABLE fakeRun, camRun, chipRun, rawExp +TITLE fake Processed Exposures +FILE fakeProcessedExp.php +MENU ipp.science.dat + +# limit this table to non-OBJECT types of images +WHERE fakeRun.state != 'new' +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id + +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 fakeRun.fake_id=$fakeRun.fake_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, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD fakeRun.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, 8, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 8, %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, %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/fakeProcessedImfile.d =================================================================== --- /trunk/ippMonitor/def/fakeProcessedImfile.d (revision 19084) +++ /trunk/ippMonitor/def/fakeProcessedImfile.d (revision 19084) @@ -0,0 +1,53 @@ +TABLE fakeRun, fakeProcessedImfile, camRun, chipRun, rawExp +TITLE fake Processed Imfile +FILE fakeProcessedImfile.php +MENU ipp.science.dat + +# limit this table to non-OBJECT types of images +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id +WHERE fakeProcessedImfile.fake_id = fakeRun.fake_id +WHERE fakeProcessedImfile.fault = 0 + +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 fakeRun.fake_id=$fakeRun.fake_id + +ARGS ARG5 fakeRun.fake_id=fakeRun.fake_id +ARGS ARG5 fakeProcessedImfile.class_id=$fakeProcessedImfile.class_id +ARGS ARG5 camera=$rawExp.camera +ARGS ARG5 basename=$fakeProcessedImfile.path_base +ARGS ARG5 class=$fakeProcessedImfile.class_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 fakeProcessedImfile.class_id, 8, %s, Class ID +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD fakeRun.state, 7, %s, State, value, fakeProcessedImfile.php, ARG5 +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, 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.comment, 65, %s, Comment + +FIELD fakeProcessedImfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_log ('LOG.IMFILE'); + +# FIELD chipProcessedImfile.bg, 5, %.2f, backgnd +# FIELD chipProcessedImfile.bg_stdev, 5, %.2f, stdev +# FIELD chipProcessedImfile.n_stars, 5, %d, Nstars +# FIELD chipProcessedImfile.fwhm_major, 5, %.2f, FHWM Index: /trunk/ippMonitor/def/fakeProcessedImfile_failure.d =================================================================== --- /trunk/ippMonitor/def/fakeProcessedImfile_failure.d (revision 19084) +++ /trunk/ippMonitor/def/fakeProcessedImfile_failure.d (revision 19084) @@ -0,0 +1,53 @@ +TABLE fakeRun, fakeProcessedImfile, camRun, chipRun, rawExp +TITLE fake Processed Imfile +FILE fakeProcessedImfile_failure.php +MENU ipp.science.dat + +# limit this table to non-OBJECT types of images +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id +WHERE fakeProcessedImfile.fake_id = fakeRun.fake_id +WHERE fakeProcessedImfile.fault != 0 + +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 fakeRun.fake_id=$fakeRun.fake_id + +ARGS ARG5 fakeRun.fake_id=fakeRun.fake_id +ARGS ARG5 fakeProcessedImfile.class_id=$fakeProcessedImfile.class_id +ARGS ARG5 camera=$rawExp.camera +ARGS ARG5 basename=$fakeProcessedImfile.path_base +ARGS ARG5 class=$fakeProcessedImfile.class_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 fakeProcessedImfile.class_id, 8, %s, Class ID +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile_failure.php, ARG4 +FIELD fakeRun.state, 7, %s, State, value, fakeProcessedImfile_failure.php, ARG5 +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, 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.comment, 65, %s, Comment + +FIELD fakeProcessedImfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_log ('LOG.IMFILE'); + +# FIELD chipProcessedImfile.bg, 5, %.2f, backgnd +# FIELD chipProcessedImfile.bg_stdev, 5, %.2f, stdev +# FIELD chipProcessedImfile.n_stars, 5, %d, Nstars +# FIELD chipProcessedImfile.fwhm_major, 5, %.2f, FHWM Index: /trunk/ippMonitor/def/fakeStageExp.d =================================================================== --- /trunk/ippMonitor/def/fakeStageExp.d (revision 19084) +++ /trunk/ippMonitor/def/fakeStageExp.d (revision 19084) @@ -0,0 +1,40 @@ +TABLE fakeRun, camRun, chipRun, rawExp +TITLE Fake Stage Exposures +FILE fakeStageExp.php +MENU ipp.science.dat + +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id + +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 fakeRun.fake_id=$fakeRun.fake_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, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD fakeRun.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, 8, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 8, %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/rawExp.d =================================================================== --- /trunk/ippMonitor/def/rawExp.d (revision 19083) +++ /trunk/ippMonitor/def/rawExp.d (revision 19084) @@ -10,6 +10,6 @@ # field size format name show link to extras -FIELD exp_id, 5, %d, Exp ID -FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD exp_name, 10, %s, Exp Name +FIELD exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 FIELD telescope, 10, %s, Telescope FIELD camera, 10, %s, Camera Index: /trunk/ippMonitor/def/rawImfile.d =================================================================== --- /trunk/ippMonitor/def/rawImfile.d (revision 19083) +++ /trunk/ippMonitor/def/rawImfile.d (revision 19084) @@ -4,30 +4,31 @@ MENU ipp.imfiles.dat -HEAD PHP insert_backref ("rawExp.php", "exp_id", $ID['link']); +# 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, %d, Exp ID -FIELD exp_name, 5, %s, Exposure -FIELD telescope, 10, %s, Telescope -FIELD camera, 10, %s, Camera -FIELD class_id, 8, %s, Chip ID -FIELD exp_type, 8, %s, exp_type -FIELD dateobs, 19, %T, 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 airmass, 5, %.4f, airmass -FIELD exp_time, 5, %.2f, exp_time -FIELD ccd_temp, 5, %.2f, ccd_temp -FIELD bg, 8, %.2f, backgnd -FIELD bg_stdev, 8, %.2f, stdev -FIELD bg_mean_stdev, 8, %.2f, [stdev] -FIELD uri, 10, %s, uri +# field size format name show link to extras +FIELD rawImfile.exp_name, 5, %s, Exposure +FIELD rawImfile.class_id, 8, %s, Chip ID +FIELD rawImfile.exp_id, 5, %d, Exp ID +FIELD rawImfile.telescope, 10, %s, Telescope +FIELD rawImfile.camera, 10, %s, Camera +FIELD rawImfile.exp_type, 8, %s, exp_type +FIELD rawImfile.dateobs, 19, %T, Date/Time +FIELD rawImfile.ra, 8, %10.6f, RA, op=OP1 +FIELD rawImfile.decl, 8, %10.6f, DEC, op=OP2 +FIELD rawImfile.object, 8, %s, object +FIELD rawImfile.filter, 10, %s, FILTER +FIELD rawImfile.airmass, 5, %.4f, airmass +FIELD rawImfile.exp_time, 5, %.2f, exp_time +FIELD rawImfile.ccd_temp, 5, %.2f, ccd_temp +FIELD rawImfile.bg, 8, %.2f, backgnd +FIELD rawImfile.bg_stdev, 8, %.2f, stdev +FIELD rawImfile.bg_mean_stdev, 8, %.2f, [stdev] +FIELD rawImfile.uri, 10, %s, uri + # FIELD alt, 20, alt -# FIELD az, 20, az +# FIELD az, 20, az # FIELD posang, 20, posang # FIELD object, 20, object Index: /trunk/ippMonitor/def/warpFailedSkyfiles.d =================================================================== --- /trunk/ippMonitor/def/warpFailedSkyfiles.d (revision 19084) +++ /trunk/ippMonitor/def/warpFailedSkyfiles.d (revision 19084) @@ -0,0 +1,54 @@ +TABLE warpSkyfile, warpRun, fakeRun, camRun, chipRun, rawExp +TITLE Warp Failed Skyfiles +FILE warpFailedSkyfiles.php +MENU ipp.science.dat + +WHERE warpSkyfile.warp_id = warpRun.warp_id +WHERE warpRun.fake_id = fakeRun.fake_id +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id +WHERE warpSkyfile.fault != 0 + +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 fakeRun.fake_id=$fakeRun.fake_id +ARGS ARG5 warpRun.warp_id=$warpRun.warp_id +ARGS ARG6 warpSkyfile.skycell_id=$warpSkyfile.skycell_id + +ARGS ARG7 warpRun.warp_id=$warpRun.warp_id +ARGS ARG7 warpSkyfile.skycell_id=$warpSkyfile.skycell_id +ARGS ARG7 camera=$rawExp.camera +ARGS ARG7 basename=$warpSkyfile.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, 5, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD warpRun.warp_id, 7, %d, Warp ID, value, warpStageExp.php, ARG5 +FIELD warpSkyfile.skycell_id, 10, %s, skycell, value, warpFailedSkyfiles.php, ARG6 +FIELD warpRun.state, 7, %s, state, value, warpFailedSkyfiles.php, ARG7 +FIELD warpSkyfile.tess_id, 10, %s, tess +FIELD warpSkyfile.good_frac, 5, %s, good_frac +FIELD warpSkyfile.ignored, 5, %s, ignored +FIELD warpSkyfile.fault, 5, %s, fault +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, 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 + +TAIL PHP insert_log ('LOG.IMFILE'); Index: /trunk/ippMonitor/def/warpInputExp.d =================================================================== --- /trunk/ippMonitor/def/warpInputExp.d (revision 19083) +++ /trunk/ippMonitor/def/warpInputExp.d (revision 19084) @@ -2,5 +2,5 @@ TITLE warpInputExp FILE warpInputExp.php -MENU ipp.warp.dat +MENU ipp.science.dat WHERE warpInputExp.cam_id = camProcessedExp.cam_id Index: /trunk/ippMonitor/def/warpProcessedSkyfiles.d =================================================================== --- /trunk/ippMonitor/def/warpProcessedSkyfiles.d (revision 19084) +++ /trunk/ippMonitor/def/warpProcessedSkyfiles.d (revision 19084) @@ -0,0 +1,54 @@ +TABLE warpSkyfile, warpRun, fakeRun, camRun, chipRun, rawExp +TITLE Warp Processed Skyfiles +FILE warpProcessedSkyfiles.php +MENU ipp.science.dat + +WHERE warpSkyfile.warp_id = warpRun.warp_id +WHERE warpRun.fake_id = fakeRun.fake_id +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id +WHERE warpSkyfile.fault = 0 + +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 fakeRun.fake_id=$fakeRun.fake_id +ARGS ARG5 warpRun.warp_id=$warpRun.warp_id +ARGS ARG6 warpSkyfile.skycell_id=$warpSkyfile.skycell_id + +ARGS ARG7 warpRun.warp_id=$warpRun.warp_id +ARGS ARG7 warpSkyfile.skycell_id=$warpSkyfile.skycell_id +ARGS ARG7 camera=$rawExp.camera +ARGS ARG7 basename=$warpSkyfile.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, 5, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD warpRun.warp_id, 7, %d, Warp ID, value, warpStageExp.php, ARG5 +FIELD warpSkyfile.skycell_id, 10, %s, skycell, value, warpProcessedSkyfiles.php, ARG6 +FIELD warpRun.state, 7, %s, state, value, warpProcessedSkyfiles.php, ARG7 +FIELD warpSkyfile.tess_id, 10, %s, tess +FIELD warpSkyfile.good_frac, 5, %s, good_frac +FIELD warpSkyfile.ignored, 5, %s, ignored +FIELD warpSkyfile.fault, 5, %s, fault +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, 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 + +TAIL PHP insert_log ('LOG.IMFILE'); Index: /trunk/ippMonitor/def/warpRun.d =================================================================== --- /trunk/ippMonitor/def/warpRun.d (revision 19083) +++ /trunk/ippMonitor/def/warpRun.d (revision 19084) @@ -2,5 +2,5 @@ TITLE warpRun FILE warpRun.php -MENU ipp.warp.dat +MENU ipp.science.dat # field size format name show link to extras Index: /trunk/ippMonitor/def/warpSkycellMap.d =================================================================== --- /trunk/ippMonitor/def/warpSkycellMap.d (revision 19083) +++ /trunk/ippMonitor/def/warpSkycellMap.d (revision 19084) @@ -2,5 +2,5 @@ TITLE warpSkyCellMap FILE warpSkycellMap.php -MENU ipp.warp.dat +MENU ipp.science.dat WHERE warpSkyCellMap.warp_id = warpRun.warp_id Index: /trunk/ippMonitor/def/warpSkyfile.d =================================================================== --- /trunk/ippMonitor/def/warpSkyfile.d (revision 19083) +++ /trunk/ippMonitor/def/warpSkyfile.d (revision 19084) @@ -2,5 +2,5 @@ TITLE warpSkyfile FILE warpSkyfile.php -MENU ipp.warp.dat +MENU ipp.science.dat # field size format name show link to extras Index: /trunk/ippMonitor/def/warpStageExp.d =================================================================== --- /trunk/ippMonitor/def/warpStageExp.d (revision 19084) +++ /trunk/ippMonitor/def/warpStageExp.d (revision 19084) @@ -0,0 +1,43 @@ +TABLE warpRun, fakeRun, camRun, chipRun, rawExp +TITLE Warp Stage Exposures +FILE warpStageExp.php +MENU ipp.science.dat + +WHERE warpRun.fake_id = fakeRun.fake_id +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id + +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 fakeRun.fake_id=$fakeRun.fake_id +ARGS ARG5 warpRun.warp_id=$warpRun.warp_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, 5, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD warpRun.warp_id, 7, %d, Warp ID, value, warpStageExp.php, ARG5 +FIELD warpRun.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, 8, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 8, %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/warpStageSkyfileInputs.d =================================================================== --- /trunk/ippMonitor/def/warpStageSkyfileInputs.d (revision 19084) +++ /trunk/ippMonitor/def/warpStageSkyfileInputs.d (revision 19084) @@ -0,0 +1,48 @@ +TABLE warpSkyCellMap, warpRun, fakeRun, camRun, chipRun, rawExp +TITLE Warp Stage Skyfile Inputs +FILE warpStageSkyfileInputs.php +MENU ipp.science.dat + +WHERE warpSkyCellMap.warp_id = warpRun.warp_id +WHERE warpRun.fake_id = fakeRun.fake_id +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id + +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 fakeRun.fake_id=$fakeRun.fake_id +ARGS ARG5 warpRun.warp_id=$warpRun.warp_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 warpSkyCellMap.class_id, 8, %s, Class ID +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD warpRun.warp_id, 7, %d, Warp ID, value, warpStageExp.php, ARG5 +FIELD warpRun.state, 7, %s, state +FIELD warpSkyCellMap.skycell_id, 10, %s, skycell +FIELD warpSkyCellMap.tess_id, 10, %s, tess +FIELD warpSkyCellMap.fault, 10, %s, fault +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, 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/warpStageSkyfiles.d =================================================================== --- /trunk/ippMonitor/def/warpStageSkyfiles.d (revision 19084) +++ /trunk/ippMonitor/def/warpStageSkyfiles.d (revision 19084) @@ -0,0 +1,48 @@ +TABLE warpSkyCellMap, warpRun, fakeRun, camRun, chipRun, rawExp +TITLE Warp Stage Skyfiles +FILE warpStageSkyfiles.php +MENU ipp.science.dat + +WHERE warpSkyCellMap.warp_id = warpRun.warp_id +WHERE warpRun.fake_id = fakeRun.fake_id +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id + +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 fakeRun.fake_id=$fakeRun.fake_id +ARGS ARG5 warpRun.warp_id=$warpRun.warp_id +ARGS ARG6 warpSkyfile.skycell_id=$warpSkyCellMap.skycell_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, 5, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD warpRun.warp_id, 7, %d, Warp ID, value, warpStageExp.php, ARG5 +FIELD warpSkyCellMap.skycell_id, 10, %s, skycell, value, warpProcessedSkyfiles.php, ARG6 +FIELD warpRun.state, 7, %s, state +FIELD warpSkyCellMap.tess_id, 10, %s, tess +FIELD warpSkyCellMap.fault, 10, %s, fault +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, 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/raw/ipp.science.dat =================================================================== --- /trunk/ippMonitor/raw/ipp.science.dat (revision 19083) +++ /trunk/ippMonitor/raw/ipp.science.dat (revision 19084) @@ -21,5 +21,4 @@ menutop | menutop | link | Detrend Steps | ipp.detrend.php menutops | menutops | link | Science Steps | ipp.science.php -menutop | menutop | link | Warp Steps | ipp.warp.php menutop | menutop | link | Stack Steps | ipp.stack.php menutop | menutop | link | Diff Steps | ipp.diff.php @@ -41,8 +40,18 @@ menulink | menuselect | link | Cam Proc. Exp w/ Images | camProcessedExp.php menulink | menuselect | link | Cam Failed Exp | camProcessedExp_failure.php +menulink | menuselect | link | Cam Processed Imfiles | camProcessedImfile.php menutop | menutop | plain |   | -menutop | menutop | plain | Fake Stage (missing) | +menulink | menuselect | link | Fake-Stage Exp | fakeStageExp.php +menulink | menuselect | link | Fake Pending Exp | fakePendingExp.php +menulink | menuselect | link | Fake Processed Exp | fakeProcessedExp.php +menulink | menuselect | link | Fake Pending Imfiles | fakePendingImfile.php +menulink | menuselect | link | Fake Processed Imfiles | fakeProcessedImfile.php +menulink | menuselect | link | Fake Failed Imfiles | fakeProcessedImfile_failure.php menutop | menutop | plain |   | -menutop | menuselect | plain | Imfile Tables | +menulink | menuselect | link | Warp Stage Exp | warpStageExp.php +menulink | menuselect | link | Warp Stage Skyfiles | warpStageSkyfiles.php +menulink | menuselect | link | Warp Skyfile Inputs | warpStageSkyfileInputs.php +menulink | menuselect | link | Warp Processed Skyfiles | warpProcessedSkyfiles.php +menulink | menuselect | link | Warp Failed Skyfiles | warpFailedSkyfiles.php