Index: trunk/ippMonitor/def/detResidExp.d
===================================================================
--- trunk/ippMonitor/def/detResidExp.d	(revision 15954)
+++ trunk/ippMonitor/def/detResidExp.d	(revision 18193)
@@ -1,3 +1,3 @@
-TABLE detResidExp, rawExp
+TABLE detResidExp, rawExp, detInputExp
 TITLE detResidExp
 FILE  detResidExp.php
@@ -6,4 +6,6 @@
 # the following WHERE clauses are added to all queries joined by AND
 WHERE detResidExp.exp_id = rawExp.exp_id
+WHERE detResidExp.exp_id = detInputExp.exp_id
+WHERE detResidExp.iteration = detInputExp.iteration
 
 # define image names to be used below
@@ -20,5 +22,5 @@
 ARGS  ARG2 basename=$detResidExp.path_base
 
-OP    OP1  $detResidExp.bg / $detResidExp.bin_stdev
+OP    OP1  $detResidExp.bin_stdev > 0.0 ? $detResidExp.bg / $detResidExp.bin_stdev : NAN
 
 #     field                   size  format  name       show         link to              linkargs
@@ -28,23 +30,27 @@
 FIELD rawExp.exp_name, 	         5, %s,     Exp Name,  value,       rawImfile.php,       ARG1
 FIELD detResidExp.iteration,     5, %s,     iter,      value
+FIELD detInputExp.include,       3, %t,     used,      value
+FIELD detResidExp.accept,        3, %t,     keep,      value
+FIELD detResidExp.fault,         4, %d,     fault,     value
 FIELD *,    	                 8, %s,     image,     image=JPEG2, detResidImfile.php,  ARG2
-FIELD detResidExp.bg,            8, %s,     backgnd,   value
-FIELD detResidExp.bg_mean_stdev, 8, %s,     [stdev]
-FIELD detResidExp.bg_stdev,      8, %s,     stdev,     value
-FIELD detResidExp.bin_stdev,     8, %s,     bin stdev, value
+FIELD detResidExp.bg,            8, %.3f,   backgnd,   value
+FIELD detResidExp.bg_mean_stdev, 8, %.3f,   [stdev],   value
+FIELD detResidExp.bg_stdev,      8, %.3f,   stdev,     value
+FIELD detResidExp.bin_stdev,     8, %.3f,   bin stdev, value
 FIELD *,                         8, %s,     S/N,       op=OP1
-FIELD detResidExp.fringe_0,      8, %s,     fringe,    value
-FIELD detResidExp.fringe_1,      8, %s,     fringe err, value
-FIELD detResidExp.fringe_2,      8, %s,     fringe stdev, value
-FIELD detResidExp.user_1,        8, %s,     dfringe,    value
-FIELD detResidExp.user_2,        8, %s,     dfringe err, value
-FIELD detResidExp.user_3,        8, %s,     dfringe stdev, value
-FIELD rawExp.dateobs,            8, %s,     obs date,  value
-FIELD rawExp.filter,             8, %s,     filter,    value
-FIELD rawExp.exp_time,           8, %s,     exptime,   value
-FIELD rawExp.ccd_temp,           8, %s,     ccd temp,  value
-FIELD rawExp.airmass,            8, %s,     airmass,   value
-FIELD detResidExp.accept,        4, %s,     keep,      value
+FIELD detResidExp.fringe_0,      8, %.3f,   fringe,    value
+FIELD detResidExp.fringe_1,      8, %.3f,   fringe err, value
+FIELD detResidExp.fringe_2,      8, %.3f,   fringe stdev, value
+FIELD detResidExp.user_1,        8, %.3f,   dfringe,    value
+FIELD detResidExp.user_2,        8, %.3f,   dfringe err, value
+FIELD detResidExp.user_3,        8, %.3f,   dfringe stdev, value
+FIELD rawExp.dateobs,           19, %T,     obs date,  value
+FIELD rawExp.filter,            10, %s,     filter,    value
+FIELD rawExp.exp_time,           8, %.2f,   exptime,   value
+FIELD rawExp.ccd_temp,           8, %.2f,   ccd temp,  value
+FIELD rawExp.airmass,            8, %.4f,   airmass,   value
 FIELD detResidExp.path_base,    20, %s,     path_base, none
 
-TD_CLASS list_off $detResidExp.accept == 0
+TD_CLASS det_drop $detInputExp.include == 1 && $detResidExp.accept == 0
+TD_CLASS det_off  $detInputExp.include == 0 && $detResidExp.accept == 0
+TD_CLASS det_add  $detInputExp.include == 0 && $detResidExp.accept == 1