Index: trunk/ippMonitor/def/detResidExp.d
===================================================================
--- trunk/ippMonitor/def/detResidExp.d	(revision 12835)
+++ trunk/ippMonitor/def/detResidExp.d	(revision 13241)
@@ -1,16 +1,26 @@
-TABLE detResidExp
+TABLE detResidExp, rawExp
 TITLE detResidExp
 FILE  detResidExp.php
 MENU  ipp.detrend.dat
 
-#     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 bg,            8,    backgnd,   value
-FIELD bg_mean_stdev, 8,    [stdev]
-FIELD bg_stdev,      8,    stdev,     value
-FIELD iteration,     5,    iter,      value
-FIELD *, 	     8,    image,     image=$path_base@PPIMAGE.JPEG2, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_tag=$exp_tag,image=$path_base@PPIMAGE.JPEG1
-FIELD accept,        4,    keep,      value
-FIELD path_base,    20,    path_base, none
+# the following WHERE clauses are added to all queries joined by AND
+WHERE detResidExp.exp_tag = rawExp.exp_tag
+
+# define image names to be used below
+VALUE JPEG1 $detResidExp.path_base PPIMAGE.JPEG2 $rawExp.camera NONE
+
+#     field                   size    name       show    link to              extras
+FIELD detResidExp.det_id,        7,   Det ID,    value
+FIELD detResidExp.exp_tag, 	15,   Exposure,  value,  rawImfile.php,       exp_tag=$exp_tag
+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=JPEG1, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_tag=$exp_tag,image=1
+FIELD detResidExp.accept,        4,   keep,      value
+FIELD detResidExp.path_base,    20,   path_base, none
+
 # FIELD recipe,     15,    recipe,    value
+
+# ipp_filename.pl --filerule $rule --basename $name --camera $camera --class_id $class_id
+# getimage.php name=$1 rule=$2 camera=$3 class_id=$4