Index: trunk/ippMonitor/def/detResidExp.d
===================================================================
--- trunk/ippMonitor/def/detResidExp.d	(revision 19809)
+++ trunk/ippMonitor/def/detResidExp.d	(revision 19810)
@@ -6,4 +6,5 @@
 # the following WHERE clauses are added to all queries joined by AND
 WHERE detResidExp.exp_id = rawExp.exp_id
+WHERE detResidExp.det_id = detInputExp.det_id
 WHERE detResidExp.exp_id = detInputExp.exp_id
 WHERE detResidExp.iteration = detInputExp.iteration
@@ -26,5 +27,5 @@
 #     field                   size  format  name       show         link to              linkargs
 FIELD detResidExp.det_id,        7, %s,     Det ID,    value
-FIELD rawExp.camera,            10, %s,     camera,    value
+FIELD rawExp.camera,            10, %s,     camera,    none
 FIELD detResidExp.exp_id, 	 5, %s,     Exp ID,    value,       rawImfile.php,       ARG1
 FIELD rawExp.exp_name, 	         5, %s,     Exp Name,  value,       rawImfile.php,       ARG1
@@ -39,16 +40,23 @@
 FIELD detResidExp.bin_stdev,     8, %.3f,   bin stdev, value
 FIELD (detResidExp.bg/detResidExp.bin_stdev), 8, %.3f, S/N, value
+FIELD (detResidExp.bg/rawExp.exp_time), 8, %.3f, flux, value
 # FIELD *,                         8, %s,     S/N,       op=OP1
-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 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.pon_time,          10, %d,    pon_time,    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 rawExp.sun_alt,            8, %.4f,   sun_alt,   value
+FIELD rawExp.sun_angle,          8, %.4f,   sun_angle, value
+FIELD rawExp.moon_alt,           8, %.4f,   moon_alt,  value
+FIELD rawExp.moon_angle,         8, %.4f,   moon_angle, value
+FIELD rawExp.moon_phase,         8, %.4f,   moon_phase, value
 FIELD detResidExp.path_base,    20, %s,     path_base, none