Index: trunk/ippMonitor/def/camProcessedExp_Images.d
===================================================================
--- trunk/ippMonitor/def/camProcessedExp_Images.d	(revision 36788)
+++ trunk/ippMonitor/def/camProcessedExp_Images.d	(revision 40882)
@@ -1,3 +1,3 @@
-TABLE camRun, camProcessedExp, chipRun, rawExp
+TABLE camRun JOIN camProcessedExp using (cam_id) JOIN chipRun using (chip_id) JOIN rawExp using (exp_id)
 TITLE Camera Processed
 FILE  camProcessedExp_Images.php
@@ -6,11 +6,8 @@
 # the following WHERE clauses are added to all queries joined by AND
 WHERE camRun.state = 'full'
-WHERE camRun.chip_id = chipRun.chip_id
-WHERE chipRun.exp_id = rawExp.exp_id
-WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
 
-RESTRICT_COUNT AND dateobs >= CURDATE()
-UNRESTRICTED AND dateobs >= CURDATE()
+RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
+UNRESTRICTED AND rawExp.dateobs >= CURDATE()
 
 # define image names to be used below