Index: trunk/ippMonitor/def/camProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/camProcessedExp.d	(revision 14044)
+++ trunk/ippMonitor/def/camProcessedExp.d	(revision 14096)
@@ -1,25 +1,35 @@
-TABLE camProcessedExp, chipProcessedExp, rawExp
-TITLE Camera-Level Processed Exposures
+TABLE camRun, camProcessedExp, chipRun, rawExp
+TITLE Camera Processed
 FILE  camProcessedExp.php
 MENU  ipp.science.dat
 
-WHERE camProcessedExp.chip_id = chipProcessedExp.chip_id
-WHERE chipProcessedExp.exp_id = rawExp.exp_id
+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
 
-# define image names to be used below
-# IMAGE VAR basename filerule camera class_id
-IMAGE JPEG  $camProcessedExp.path_base PPIMAGE.JPEG2 $rawExp.camera NONE
+ARGS  ARG1  chipRun.exp_id=$chipRun.exp_id
 
-# show all chips for this camera exposure, summary stats from the camera tables
-ARGS  ARG1  camera=$rawExp.camera
-ARGS  ARG1  basename=$camProcessedExp.path_base
-ARGS  ARG1  exp_id=$chipProcessedExp.exp_id
+#     field                     size  name          show   link to                  extras
+FIELD camRun.cam_id,             5,   chip ID,      value, chipProcessedExp.php,    ARG1
+FIELD chipRun.chip_id,           5,   cam ID
+FIELD chipRun.exp_id,	         5,   exposure ID,  value, chipProcessedImfile.php, ARG1
+FIELD rawExp.exp_name,     	 5,   Exp Name,     value, rawImfile.php,  ARG1
+FIELD rawExp.telescope,      	10,   Telescope
+FIELD rawExp.camera,         	10,   Camera
+FIELD rawExp.dateobs,        	20,   Date/Time
+FIELD rawExp.filter,         	10,   FILTER
+FIELD rawExp.ra,       	         5,   RA    
+FIELD rawExp.decl,       	 5,   Dec
+FIELD rawExp.exp_time,       	 5,   exp_time    
+FIELD rawExp.sat_pixel_frac, 	 5,   f(sat pixels)
+FIELD rawExp.airmass,        	 5,   airmass     
+FIELD rawExp.bg,             	 5,   backgnd
+FIELD rawExp.bg_stdev,       	 5,   stdev    
+FIELD rawExp.bg_mean_stdev,  	 5,   <backgnd>
 
-#     field                           size  name       show        link to                  extras
-FIELD chipProcessedExp.exp_id,        5,    Exp ID,    value
-FIELD *, 	     		      8,    image,     image=JPEG, chipProcessedImfile.php, ARG1
-FIELD camProcessedExp.bg,	      8,    backgnd,   value
-FIELD camProcessedExp.bg_mean_stdev,  8,    [stdev],   value
-FIELD camProcessedExp.bg_stdev,       8,    stdev,     value
-FIELD camProcessedExp.path_base,      20,   path_base, value
-FIELD camProcessedExp.uri,            20,   uri,       value
+FIELD camProcessedExp.n_stars,  5, Nstars
+FIELD camProcessedExp.n_astrom, 5, Nastrom
+FIELD camProcessedExp.sigma_ra, 5, sigma ra
+FIELD camProcessedExp.fwhm,     5, FHWM