Index: trunk/ippMonitor/def/detNormalizedExp.d =================================================================== --- trunk/ippMonitor/def/detNormalizedExp.d (revision 10963) +++ trunk/ippMonitor/def/detNormalizedExp.d (revision 11490) @@ -10,5 +10,5 @@ FIELD bg_stdev, 8, stdev FIELD iteration, 5, iteration -FIELD b2_uri, 8, image, image=$b2_uri, detNormalizedImfile.php, det_id=$det_id,iteration=$iteration,image=$b1_uri +FIELD b2_uri, 8, image, image=$b1_uri@PPIMAGE.JPEG2, detNormalizedImfile.php, det_id=$det_id,iteration=$iteration,image=$b1_uri@PPIMAGE.JPEG1 #FIELD b1_uri, 20, b1_uri #FIELD recipe, 20, recipe Index: trunk/ippMonitor/def/detProcessedExp.d =================================================================== --- trunk/ippMonitor/def/detProcessedExp.d (revision 10963) +++ trunk/ippMonitor/def/detProcessedExp.d (revision 11490) @@ -7,5 +7,5 @@ FIELD det_id, 7, Det ID, value FIELD exp_tag, 15, Exposure, value -FIELD b2_uri, 8, image, image=$b2_uri, detProcessedImfile.php, det_id=$det_id,exp_tag=$exp_tag,image=$b1_uri +FIELD b2_uri, 8, image, image=$b1_uri@PPIMAGE.JPEG2, detProcessedImfile.php, det_id=$det_id,exp_tag=$exp_tag,image=$b1_uri@PPIMAGE.JPEG1 FIELD bg, 8, backgnd, value FIELD bg_mean_stdev, 8, [stdev], value Index: trunk/ippMonitor/def/detResidExp.d =================================================================== --- trunk/ippMonitor/def/detResidExp.d (revision 10963) +++ trunk/ippMonitor/def/detResidExp.d (revision 11490) @@ -4,8 +4,8 @@ MENU ipp.detrend.dat -# field size name show link to extras +# field size name show link to extras FIELD det_id, 7, Det ID, value -FIELD exp_tag, 15, Exposure, value, rawImfile.php, exp_tag=$exp_tag -FIELD b2_uri, 8, image, image=$b2_uri, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_tag=$exp_tag,image=$b1_uri +FIELD exp_tag, 15, Exposure, value, rawImfile.php, exp_tag=$exp_tag +FIELD b2_uri, 8, image, image=$b1_uri@PPIMAGE.JPEG2, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_tag=$exp_tag,image=$b1_uri@PPIMAGE.JPEG1 FIELD bg, 8, backgnd, value FIELD bg_mean_stdev, 8, [stdev] Index: trunk/ippMonitor/def/newExp.d =================================================================== --- trunk/ippMonitor/def/newExp.d (revision 10963) +++ trunk/ippMonitor/def/newExp.d (revision 11490) @@ -9,4 +9,3 @@ FIELD camera, 20, camera FIELD telescope, 20, telescope -FIELD exp_type, 20, type FIELD imfiles, 20, N imfiles Index: trunk/ippMonitor/def/p3ProcessedExp.d =================================================================== --- trunk/ippMonitor/def/p3ProcessedExp.d (revision 10963) +++ trunk/ippMonitor/def/p3ProcessedExp.d (revision 11490) @@ -6,5 +6,5 @@ # field size name show link to extras FIELD exp_tag, 15, Exposure, value -FIELD b2_uri, 8, image, image=$b2_uri, p2ProcessedImfile.php, exp_tag=$exp_tag,image=$b1_uri +FIELD b2_uri, 8, image, image=$b1_uri@PPIMAGE.JPEG2, p2ProcessedImfile.php, exp_tag=$exp_tag,image=$b1_uri@PPIMAGE.JPEG1 FIELD bg, 8, backgnd, value FIELD bg_mean_stdev, 8, [stdev], value Index: trunk/ippMonitor/def/rawDetrendExp.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp.d (revision 10963) +++ trunk/ippMonitor/def/rawDetrendExp.d (revision 11490) @@ -1,6 +1,9 @@ -TABLE rawDetrendExp +TABLE rawExp TITLE Raw Detrend Exposures FILE rawDetrendExp.php MENU ipp.copy.dat + +# limit this table to non-OBJECT types of images +WHERE rawExp.exp_type != 'OBJECT' # field name show link to extras Index: trunk/ippMonitor/def/rawDetrendExp_detrend.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp_detrend.d (revision 10963) +++ trunk/ippMonitor/def/rawDetrendExp_detrend.d (revision 11490) @@ -1,13 +1,22 @@ -TABLE rawDetrendExp +TABLE rawExp TITLE Raw Detrend Exposures FILE rawDetrendExp.php MENU ipp.detrend.dat +# limit this table to non-OBJECT types of images +WHERE rawExp.exp_type != 'OBJECT' + # field name show link to extras -FIELD exp_tag, 20, exposure ID, value, rawImfile.php, exp_tag=$exp_tag -FIELD telescope, 20, Telescope -FIELD camera, 20, Camera -FIELD exp_type, 20, Type -FIELD filter, 20, FILTER +FIELD exp_tag, 10, exposure ID, value, rawImfile.php, exp_tag=$exp_tag +FIELD telescope, 10, Telescope +FIELD camera, 10, Camera +FIELD exp_type, 10, Type +FIELD filter, 10, FILTER +FIELD dateobs, 20, Date/Time +FIELD exp_time, 5, exp_time +FIELD airmass, 5, airmass +FIELD bg, 5, backgnd +FIELD bg_stdev, 5, stdev +FIELD bg_mean_stdev, 5, <backgnd> # FIELD imfiles, 20, imfiles # FIELD airmass, 20, airmass Index: trunk/ippMonitor/def/rawImfile.d =================================================================== --- trunk/ippMonitor/def/rawImfile.d (revision 10963) +++ trunk/ippMonitor/def/rawImfile.d (revision 11490) @@ -3,4 +3,6 @@ FILE rawImfile.php MENU ipp.imfiles.dat + +HEAD PHP insert_backref ("rawUnknownExp.php", "exp_tag", $ID['link']); # field name show link to extras Index: trunk/ippMonitor/def/rawScienceExp.d =================================================================== --- trunk/ippMonitor/def/rawScienceExp.d (revision 10963) +++ trunk/ippMonitor/def/rawScienceExp.d (revision 11490) @@ -1,6 +1,9 @@ -TABLE rawScienceExp +TABLE rawExp TITLE Raw Science Exposures FILE rawScienceExp.php MENU ipp.copy.dat + +# limit this table to OBJECT types of images +WHERE rawExp.exp_type = 'OBJECT' # field name show link to extras