Index: trunk/ippMonitor/def/detInputExp.d
===================================================================
--- trunk/ippMonitor/def/detInputExp.d (revision 13566)
+++ trunk/ippMonitor/def/detInputExp.d (revision 13595)
@@ -14,4 +14,8 @@
ARGS ARG2 detProcessedImfile.iteration=$detInputExp.iteration
+HEAD PHP if ($_GET['detInputExp_det_id']) {
+HEAD PHP echo " resid ";
+HEAD PHP echo " proc "; }
+
# field width name show link to extras
FIELD detInputExp.det_id, 7, det_id
Index: trunk/ippMonitor/def/detProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/detProcessedExp.d (revision 13566)
+++ trunk/ippMonitor/def/detProcessedExp.d (revision 13595)
@@ -16,4 +16,6 @@
ARGS ARG1 basename=$detProcessedExp.path_base
+OP OP1 $detProcessedExp.bg / $detProcessedExp.bg_stdev
+
# field size name show link to extras
FIELD detProcessedExp.det_id, 7, Det ID, value
@@ -24,5 +26,10 @@
FIELD detProcessedExp.bg_mean_stdev, 8, [stdev], value
FIELD detProcessedExp.bg_stdev, 8, stdev, value
-FIELD detProcessedExp.recipe, 15, Recipe, value
+FIELD *, 8, S/N, op=OP1
+FIELD rawExp.dateobs, 8, obs date, value
+FIELD rawExp.filter, 8, filter, value
+FIELD rawExp.exp_time, 8, exptime, value
+FIELD rawExp.ccd_temp, 8, ccd temp, value
+FIELD rawExp.airmass, 8, airmass, value
FIELD detProcessedExp.path_base, 20, path_base, none
Index: trunk/ippMonitor/def/detResidExp.d
===================================================================
--- trunk/ippMonitor/def/detResidExp.d (revision 13566)
+++ trunk/ippMonitor/def/detResidExp.d (revision 13595)
@@ -20,15 +20,23 @@
ARGS ARG2 basename=$detResidExp.path_base
+OP OP1 $detResidExp.bg / $detResidExp.bg_stdev
+
# field size name show link to linkargs
FIELD detResidExp.det_id, 7, Det ID, value
+FIELD rawExp.camera, 10, camera, value
FIELD detResidExp.exp_tag, 15, Exposure, value, rawImfile.php, ARG1
+FIELD detResidExp.iteration, 5, iter, value
+FIELD *, 8, image, image=JPEG2, detResidImfile.php, ARG2
FIELD detResidExp.bg, 8, backgnd, value
FIELD detResidExp.bg_mean_stdev, 8, [stdev]
FIELD detResidExp.bg_stdev, 8, stdev, value
-FIELD detResidExp.iteration, 5, iter, value
-FIELD *, 8, image, image=JPEG2, detResidImfile.php, ARG2
+FIELD *, 8, S/N, op=OP1
+FIELD rawExp.dateobs, 8, obs date, value
+FIELD rawExp.filter, 8, filter, value
+FIELD rawExp.exp_time, 8, exptime, value
+FIELD rawExp.ccd_temp, 8, ccd temp, value
+FIELD rawExp.airmass, 8, airmass, value
FIELD detResidExp.accept, 4, keep, value
-FIELD detResidExp.path_base, 20, path_base, none
-FIELD rawExp.camera, 20, camera, none
+FIELD detResidExp.path_base, 20, path_base, none
TD_CLASS list_off $detResidExp.accept == 0
Index: trunk/ippMonitor/def/detResidImfile.d
===================================================================
--- trunk/ippMonitor/def/detResidImfile.d (revision 13566)
+++ trunk/ippMonitor/def/detResidImfile.d (revision 13595)
@@ -14,5 +14,5 @@
# FIELD uri, 20, uri
# FIELD recipe, 20, recipe
-# FIELD path_base, 20, path_base
+FIELD path_base, 20, path_base
TAIL PHP insert_image ('PPIMAGE.JPEG1');
Index: trunk/ippMonitor/def/detRun.d
===================================================================
--- trunk/ippMonitor/def/detRun.d (revision 13566)
+++ trunk/ippMonitor/def/detRun.d (revision 13595)
@@ -4,11 +4,22 @@
MENU ipp.detrend.dat
-ARGS ARG1 det_id=$det_id
+ARGS ARG1 detRunSummary.det_id=$det_id
-# field width name show link to extras
-FIELD det_id, 7, det ID, value, detRunSummary.php, ARG1
-FIELD iteration, 5, iteration
-FIELD det_type, 8, det_type
+ARGS ARG2 detInputExp.det_id=$det_id
+ARGS ARG2 detInputExp.iteration=$iteration
+
+ARGS ARG3 detProcessedExp.det_id=$det_id
+
+ARGS ARG4 detResidExp.det_id=$det_id
+ARGS ARG4 detResidExp.iteration=$iteration
+
+# field width name show link to extras
+FIELD det_id, 5, det ID, value, detRunSummary.php, ARG1
+FIELD iteration, 3, iter
+FIELD det_type, 5, type
FIELD state, 5, state
+FIELD *, 5, choose, value=input, detInputExp.php, ARG2
+FIELD *, 5, choose, value=proc, detProcessedExp.php, ARG3
+FIELD *, 5, choose, value=resid, detResidExp.php, ARG4
FIELD mode, 5, mode
FIELD filter, 10, filter
Index: trunk/ippMonitor/def/detRunSummary.d
===================================================================
--- trunk/ippMonitor/def/detRunSummary.d (revision 13566)
+++ trunk/ippMonitor/def/detRunSummary.d (revision 13595)
@@ -4,14 +4,19 @@
MENU ipp.detrend.dat
-ARGS ARG1 det_id=$det_id
-ARGS ARG1 iteration=$iteration
+ARGS ARG1 detInputExp.det_id=$detRunSummary.det_id
+ARGS ARG1 detInputExp.iteration=$detRunSummary.iteration
-# field name show link to extras
-FIELD det_id, 7, det_id
-FIELD iteration, 5, iter
-FIELD accept, 4, keep
-FIELD *, 20, choose, value=input, detInputExp.php, ARG1
-FIELD *, 20, choose, value=resid, detResidExp.php, ARG1
-FIELD bg, 20, bg
-FIELD bg_stdev, 20, bg_stdev
-# FIELD bg_mean_stdev, 20, bg_mean_stdev
+ARGS ARG2 detResidExp.det_id=$detRunSummary.det_id
+ARGS ARG2 detResidExp.iteration=$detRunSummary.iteration
+
+# field name show link to extras
+FIELD detRunSummary.det_id, 7, det_id
+FIELD detRunSummary.iteration, 5, iter
+FIELD detRunSummary.accept, 4, keep
+FIELD *, 20, choose, value=input, detInputExp.php, ARG1
+FIELD *, 20, choose, value=proc, detProcessedExp.php, ARG3
+FIELD *, 20, choose, value=resid, detResidExp.php, ARG2
+FIELD detRunSummary.bg, 20, bg
+FIELD detRunSummary.bg_stdev, 20, bg_stdev
+
+TD_CLASS list_off $detRunSummary.accept == 0
Index: trunk/ippMonitor/def/masterDetrendFrames.d
===================================================================
--- trunk/ippMonitor/def/masterDetrendFrames.d (revision 13566)
+++ trunk/ippMonitor/def/masterDetrendFrames.d (revision 13595)
@@ -23,7 +23,8 @@
# field width name show link to extras
-FIELD detRunSummary.det_id, 7, det_id, value, detRunSummary.php, ARG1
-FIELD detRunSummary.iteration, 5, iter
+FIELD detRunSummary.det_id, 5, det ID, value, detRunSummary.php, ARG1
+FIELD detRunSummary.iteration, 3, iter
FIELD detRun.det_type, 5, type
+FIELD detRun.state, 5, state
FIELD *, 20, choose, value=input, detInputExp.php, ARG2
FIELD *, 20, choose, value=proc, detProcessedExp.php, ARG3