Index: trunk/ippMonitor/def/camPendingExp.d
===================================================================
--- trunk/ippMonitor/def/camPendingExp.d	(revision 19157)
+++ trunk/ippMonitor/def/camPendingExp.d	(revision 19183)
@@ -4,5 +4,5 @@
 MENU  ipp.science.dat
 
-WHERE camRun.state = 'run'
+WHERE camRun.state = 'new'
 WHERE camRun.chip_id = chipRun.chip_id
 WHERE chipRun.exp_id = rawExp.exp_id
@@ -21,4 +21,5 @@
 FIELD camRun.cam_id,             5,   %s,     Cam ID
 FIELD camRun.state,              5,   %s,     State
+FIELD camRun.label,              5,   %s,     Label
 FIELD rawExp.telescope,      	10,   %s,     Telescope
 FIELD rawExp.camera,         	10,   %s,     Camera
Index: trunk/ippMonitor/def/camProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/camProcessedExp.d	(revision 19157)
+++ trunk/ippMonitor/def/camProcessedExp.d	(revision 19183)
@@ -5,5 +5,5 @@
 
 # the following WHERE clauses are added to all queries joined by AND
-WHERE camRun.state = 'stop'
+WHERE camRun.state = 'full'
 WHERE camRun.chip_id = chipRun.chip_id
 WHERE chipRun.exp_id = rawExp.exp_id
@@ -32,4 +32,5 @@
 FIELD chipRun.chip_id,           	 5,   %s,     Chip ID,      value,  	 chipProcessedImfile.php, ARG2
 FIELD camRun.cam_id,             	 5,   %s,     Cam ID,       value,  	 camProcessedExp.php,     ARG3
+FIELD camRun.label,             	 5,   %s,     Label
 FIELD *,    	                	 8,   %s,     image,        image=JPEG2, camProcessedImfile.php,  ARG4
 FIELD rawExp.telescope,      		10,   %s,     Telescope
Index: trunk/ippMonitor/def/camProcessedExp_NoImages.d
===================================================================
--- trunk/ippMonitor/def/camProcessedExp_NoImages.d	(revision 19157)
+++ trunk/ippMonitor/def/camProcessedExp_NoImages.d	(revision 19183)
@@ -5,5 +5,5 @@
 
 # the following WHERE clauses are added to all queries joined by AND
-WHERE camRun.state = 'stop'
+WHERE camRun.state = 'full'
 WHERE camRun.chip_id = chipRun.chip_id
 WHERE chipRun.exp_id = rawExp.exp_id
@@ -29,4 +29,5 @@
 FIELD camRun.cam_id,             	 5,   %s,     Cam ID,       value,  	 camProcessedExp.php,     ARG3
 FIELD camRun.state,                      5,   %s,     state,        value,  	 camProcessedImfile.php,  ARG4
+FIELD camRun.label,                      5,   %s,     label
 FIELD rawExp.telescope,      		10,   %s,     Telescope
 FIELD rawExp.camera,         		10,   %s,     Camera
Index: trunk/ippMonitor/def/camProcessedExp_failure.d
===================================================================
--- trunk/ippMonitor/def/camProcessedExp_failure.d	(revision 19157)
+++ trunk/ippMonitor/def/camProcessedExp_failure.d	(revision 19183)
@@ -5,5 +5,5 @@
 
 # the following WHERE clauses are added to all queries joined by AND
-WHERE camRun.state = 'stop'
+WHERE camRun.state = 'full'
 WHERE camRun.chip_id = chipRun.chip_id
 WHERE chipRun.exp_id = rawExp.exp_id
@@ -29,4 +29,5 @@
 FIELD camRun.cam_id,            	 5,   %d,     Cam ID,       value,       camProcessedExp_failure.php, ARG3
 FIELD camRun.state,                      5,   %s,     state,        value,       camProcessedImfile.php,      ARG4
+FIELD camRun.label,                      5,   %s,     label
 FIELD rawExp.telescope,      		10,   %s,     Telescope
 FIELD rawExp.camera,         		10,   %s,     Camera
Index: trunk/ippMonitor/def/camProcessedImfile.d
===================================================================
--- trunk/ippMonitor/def/camProcessedImfile.d	(revision 19157)
+++ trunk/ippMonitor/def/camProcessedImfile.d	(revision 19183)
@@ -5,5 +5,5 @@
 
 # the following WHERE clauses are added to all queries joined by AND
-WHERE camRun.state = 'stop'
+WHERE camRun.state = 'full'
 WHERE camRun.chip_id = chipRun.chip_id
 WHERE chipRun.exp_id = rawExp.exp_id
@@ -24,4 +24,5 @@
 FIELD chipRun.chip_id,          	 5,   %s,     Chip ID,      value,       chipProcessedImfile.php, ARG2
 FIELD camRun.cam_id,            	 5,   %s,     Cam ID,       value,       camProcessedExp.php,     ARG3
+FIELD camRun.label,             	 5,   %s,     Label
 FIELD rawExp.telescope,      		10,   %s,     Telescope
 FIELD rawExp.camera,         		10,   %s,     Camera
Index: trunk/ippMonitor/def/camStageExp.d
===================================================================
--- trunk/ippMonitor/def/camStageExp.d	(revision 19157)
+++ trunk/ippMonitor/def/camStageExp.d	(revision 19183)
@@ -20,4 +20,5 @@
 FIELD camRun.cam_id,             5,   %s,     Cam ID,       value,  camProcessedExp.php,     ARG3
 FIELD camRun.state,              5,   %s,     state
+FIELD camRun.label,              5,   %s,     label
 FIELD rawExp.telescope,      	10,   %s,     Telescope
 FIELD rawExp.camera,         	10,   %s,     Camera
Index: trunk/ippMonitor/def/chipPendingExp.d
===================================================================
--- trunk/ippMonitor/def/chipPendingExp.d	(revision 19157)
+++ trunk/ippMonitor/def/chipPendingExp.d	(revision 19183)
@@ -19,4 +19,5 @@
 FIELD chipRun.chip_id,    	 7, %d,     Chip ID,     value,  chipProcessedImfile.php, ARG2
 FIELD chipRun.state,    	 7, %s,     State
+FIELD chipRun.label,    	 7, %s,     Label
 FIELD rawExp.telescope,      	10, %s,     Telescope
 FIELD rawExp.camera,         	10, %s,     Camera
Index: trunk/ippMonitor/def/chipPendingImfile.d
===================================================================
--- trunk/ippMonitor/def/chipPendingImfile.d	(revision 19157)
+++ trunk/ippMonitor/def/chipPendingImfile.d	(revision 19183)
@@ -24,4 +24,5 @@
 FIELD chipRun.chip_id,    	 7, %d,     Chip ID,     value,  chipProcessedImfile.php, ARG2
 FIELD chipRun.state,    	 7, %s,     State
+FIELD chipRun.label,    	 7, %s,     Label
 FIELD rawExp.telescope,      	10, %s,     Telescope
 FIELD rawExp.camera,         	10, %s,     Camera
Index: trunk/ippMonitor/def/chipProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/chipProcessedExp.d	(revision 19157)
+++ trunk/ippMonitor/def/chipProcessedExp.d	(revision 19183)
@@ -19,4 +19,5 @@
 FIELD chipRun.chip_id,    	 7, %d,     Chip ID,     value,  chipProcessedImfile.php, ARG2
 FIELD chipRun.state,    	 7, %s,     State
+FIELD chipRun.label,    	 7, %s,     Label
 FIELD rawExp.telescope,      	10, %s,     Telescope
 FIELD rawExp.camera,         	10, %s,     Camera
Index: trunk/ippMonitor/def/chipProcessedImfile.d
===================================================================
--- trunk/ippMonitor/def/chipProcessedImfile.d	(revision 19157)
+++ trunk/ippMonitor/def/chipProcessedImfile.d	(revision 19183)
@@ -29,4 +29,5 @@
 FIELD chipRun.chip_id,        	   	  7, %d,     Chip ID,     value,  chipProcessedImfile.php, ARG2
 FIELD chipRun.state,        	   	  7, %s,     State,       value,  chipProcessedImfile.php, ARG3
+FIELD chipRun.label,        	   	  7, %s,     Label
 FIELD rawExp.telescope,      	   	 10, %s,     Telescope
 FIELD rawExp.camera,         	   	 10, %s,     Camera
Index: trunk/ippMonitor/def/chipProcessedImfile_failure.d
===================================================================
--- trunk/ippMonitor/def/chipProcessedImfile_failure.d	(revision 19157)
+++ trunk/ippMonitor/def/chipProcessedImfile_failure.d	(revision 19183)
@@ -29,4 +29,5 @@
 FIELD chipRun.chip_id,        	   	  7, %d,     Chip ID,     value,  chipProcessedImfile_failure.php, ARG2
 FIELD chipRun.state,        	   	  7, %s,     State,       value,  chipProcessedImfile_failure.php, ARG3
+FIELD chipRun.label,        	   	  7, %s,     Label
 FIELD rawExp.telescope,      	   	 10, %s,     Telescope
 FIELD rawExp.camera,         	   	 10, %s,     Camera
Index: trunk/ippMonitor/def/chipStageExp.d
===================================================================
--- trunk/ippMonitor/def/chipStageExp.d	(revision 19157)
+++ trunk/ippMonitor/def/chipStageExp.d	(revision 19183)
@@ -17,4 +17,5 @@
 FIELD chipRun.chip_id,    	 7, %d,     Chip ID,     value,  chipProcessedImfile.php, ARG2
 FIELD chipRun.state,    	 7, %s,     State
+FIELD chipRun.label,    	 7, %s,     Label
 FIELD rawExp.telescope,      	10, %s,     Telescope
 FIELD rawExp.camera,         	10, %s,     Camera
Index: trunk/ippMonitor/def/fakePendingExp.d
===================================================================
--- trunk/ippMonitor/def/fakePendingExp.d	(revision 19157)
+++ trunk/ippMonitor/def/fakePendingExp.d	(revision 19183)
@@ -25,4 +25,5 @@
 FIELD fakeRun.fake_id,    	 7, %d,     Fake ID,      value,  fakeProcessedImfile.php, ARG4
 FIELD fakeRun.state,    	 7, %s,     state
+FIELD fakeRun.label,    	 7, %s,     label
 FIELD rawExp.telescope,      	10, %s,     Telescope
 FIELD rawExp.camera,         	10, %s,     Camera
Index: trunk/ippMonitor/def/fakePendingImfile.d
===================================================================
--- trunk/ippMonitor/def/fakePendingImfile.d	(revision 19157)
+++ trunk/ippMonitor/def/fakePendingImfile.d	(revision 19183)
@@ -25,5 +25,6 @@
 FIELD camRun.cam_id,          	 5, %s,     Cam ID,      alue,   camProcessedExp.php,     ARG3
 FIELD fakeRun.fake_id,        	 5, %s,     Fake ID,     value,  fakeProcessedImfile.php, ARG4
-FIELD chipRun.state,    	 7, %s,     State
+FIELD fakeRun.state,    	 7, %s,     State
+FIELD fakeRun.label,    	 7, %s,     label
 FIELD rawExp.telescope,      	10, %s,     Telescope
 FIELD rawExp.camera,         	10, %s,     Camera
Index: trunk/ippMonitor/def/fakeProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/fakeProcessedExp.d	(revision 19157)
+++ trunk/ippMonitor/def/fakeProcessedExp.d	(revision 19183)
@@ -25,4 +25,5 @@
 FIELD fakeRun.fake_id,    	 7, %d,     Fake ID,      value,  fakeProcessedImfile.php, ARG4
 FIELD fakeRun.state,    	 7, %s,     state
+FIELD fakeRun.label,    	 7, %s,     label
 FIELD rawExp.telescope,      	10, %s,     Telescope
 FIELD rawExp.camera,         	10, %s,     Camera
Index: trunk/ippMonitor/def/fakeProcessedImfile.d
===================================================================
--- trunk/ippMonitor/def/fakeProcessedImfile.d	(revision 19157)
+++ trunk/ippMonitor/def/fakeProcessedImfile.d	(revision 19183)
@@ -33,4 +33,5 @@
 FIELD fakeRun.fake_id,                 7, %d,     Fake ID,      value,  fakeProcessedImfile.php, ARG4
 FIELD fakeRun.state,                   7, %s,     State,       value,  fakeProcessedImfile.php, ARG5
+FIELD fakeRun.label,                   7, %s,     Label
 FIELD rawExp.telescope,               10, %s,     Telescope
 FIELD rawExp.camera,                  10, %s,     Camera
Index: trunk/ippMonitor/def/fakeProcessedImfile_failure.d
===================================================================
--- trunk/ippMonitor/def/fakeProcessedImfile_failure.d	(revision 19157)
+++ trunk/ippMonitor/def/fakeProcessedImfile_failure.d	(revision 19183)
@@ -33,4 +33,5 @@
 FIELD fakeRun.fake_id,                 7, %d,     Fake ID,      value,  fakeProcessedImfile_failure.php, ARG4
 FIELD fakeRun.state,                   7, %s,     State,       value,  fakeProcessedImfile_failure.php, ARG5
+FIELD fakeRun.label,                   7, %s,     Label
 FIELD rawExp.telescope,               10, %s,     Telescope
 FIELD rawExp.camera,                  10, %s,     Camera
Index: trunk/ippMonitor/def/fakeStageExp.d
===================================================================
--- trunk/ippMonitor/def/fakeStageExp.d	(revision 19157)
+++ trunk/ippMonitor/def/fakeStageExp.d	(revision 19183)
@@ -23,4 +23,5 @@
 FIELD fakeRun.fake_id,    	 7, %d,     Fake ID,      value,  fakeProcessedImfile.php, ARG4
 FIELD fakeRun.state,    	 7, %s,     state
+FIELD fakeRun.label,    	 7, %s,     label
 FIELD rawExp.telescope,      	10, %s,     Telescope
 FIELD rawExp.camera,         	10, %s,     Camera
Index: trunk/ippMonitor/def/stackFailedSkyfile.d
===================================================================
--- trunk/ippMonitor/def/stackFailedSkyfile.d	(revision 19157)
+++ trunk/ippMonitor/def/stackFailedSkyfile.d	(revision 19183)
@@ -7,10 +7,19 @@
 WHERE stackSumSkyfile.fault != 0
 
-#        field                          size  format  name           show     link to         extras
+ARGS  ARG7 stackRun.stack_id=$stackRun.stack_id
+ARGS  ARG7 stackRun.skycell_id=$stackRun.skycell_id
+# XXX need to fix this: there may not be a single camera per stack...
+ARGS  ARG7 camera=GPC1
+ARGS  ARG7 basename=$stackSumSkyfile.path_base
+
+#        field                          size  format  name    show     link to         extras
 FIELD stackRun.stack_id,            5, %s,     Stack ID
 FIELD stackRun.skycell_id,          5, %s,     Skycell ID
-FIELD stackRun.state,    	    7, %s,     State
+FIELD stackRun.state,    	    7, %s,     State,         value,   stackFailedSkyfile.php, ARG7
 FIELD stackSumSkyfile.bg,           5, %.2f,   backgnd
 FIELD stackSumSkyfile.bg_stdev,     5, %.2f,   stdev    
 FIELD stackSumSkyfile.dtime_stack,  5, %.2f,   dtime
 
+FIELD stackSumSkyfile.path_base,    5, %s,     path_base,     none
+
+TAIL PHP insert_log ('LOG.EXP');
Index: trunk/ippMonitor/def/stackInputSkyfile.d
===================================================================
--- trunk/ippMonitor/def/stackInputSkyfile.d	(revision 19157)
+++ trunk/ippMonitor/def/stackInputSkyfile.d	(revision 19183)
@@ -1,3 +1,3 @@
-TABLE stackInputSkyfile, stackRun, warpRun, fakeRun, camRun, chipRun, rawExp
+TABLE stackInputSkyfile, stackRun, warpRun, warpSkyfile, fakeRun, camRun, chipRun, rawExp
 TITLE Stack Input Exposures
 FILE  stackInputSkyfile.php
@@ -7,4 +7,6 @@
 WHERE stackInputSkyfile.warp_id = warpRun.warp_id
 WHERE warpRun.fake_id = fakeRun.fake_id
+WHERE warpSkyfile.warp_id = warpRun.warp_id
+WHERE warpSkyfile.skycell_id = stackRun.skycell_id
 WHERE fakeRun.cam_id = camRun.cam_id
 WHERE camRun.chip_id = chipRun.chip_id
@@ -39,4 +41,5 @@
 FIELD rawExp.exp_time,       	    5, %.2f,   exp_time    
 FIELD rawExp.airmass,        	    5, %.4f,   airmass     
+FIELD warpSkyfile.good_frac,   	    7, %.4f,   warp good f
 FIELD rawExp.bg,             	    5, %.2f,   backgnd
 FIELD rawExp.bg_stdev,       	    5, %.2f,   stdev    
Index: trunk/ippMonitor/def/stackProcessedSkyfile.d
===================================================================
--- trunk/ippMonitor/def/stackProcessedSkyfile.d	(revision 19157)
+++ trunk/ippMonitor/def/stackProcessedSkyfile.d	(revision 19183)
@@ -8,10 +8,19 @@
 WHERE stackSumSkyfile.fault = 0
 
-#        field                          size  format  name           show     link to         extras
+ARGS  ARG7 stackRun.stack_id=$stackRun.stack_id
+ARGS  ARG7 stackRun.skycell_id=$stackRun.skycell_id
+# XXX need to fix this: there may not be a single camera per stack...
+ARGS  ARG7 camera=GPC1
+ARGS  ARG7 basename=$stackSumSkyfile.path_base
+
+#        field                   size  format  name           show     link to         extras
 FIELD stackRun.stack_id,            5, %s,     Stack ID
 FIELD stackRun.skycell_id,          5, %s,     Skycell ID
-FIELD stackRun.state,    	    7, %s,     State
+FIELD stackRun.state,    	    7, %s,     State,         value,   stackProcessedSkyfile.php, ARG7
 FIELD stackSumSkyfile.bg,           5, %.2f,   backgnd
 FIELD stackSumSkyfile.bg_stdev,     5, %.2f,   stdev    
 FIELD stackSumSkyfile.dtime_stack,  5, %.2f,   dtime
 
+FIELD stackSumSkyfile.path_base,    5, %s,     path_base,     none
+
+TAIL PHP insert_log ('LOG.EXP');
Index: trunk/ippMonitor/def/warpFailedSkyfiles.d
===================================================================
--- trunk/ippMonitor/def/warpFailedSkyfiles.d	(revision 19157)
+++ trunk/ippMonitor/def/warpFailedSkyfiles.d	(revision 19183)
@@ -35,4 +35,5 @@
 FIELD warpSkyfile.skycell_id, 	 10, %s,     skycell,      value,  warpFailedSkyfiles.php,  ARG6
 FIELD warpRun.state,    	  7, %s,     state,        value,  warpFailedSkyfiles.php,  ARG7
+FIELD warpRun.label,    	  7, %s,     label
 FIELD warpSkyfile.tess_id,    	 10, %s,     tess
 FIELD warpSkyfile.good_frac,  	  5, %s,     good_frac
Index: trunk/ippMonitor/def/warpInputExp.d
===================================================================
--- trunk/ippMonitor/def/warpInputExp.d	(revision 19157)
+++ 	(revision )
@@ -1,30 +1,0 @@
-TABLE warpInputExp, camProcessedExp, chipRun, rawExp
-TITLE warpInputExp
-FILE  warpInputExp.php
-MENU  ipp.science.dat
-
-WHERE warpInputExp.cam_id = camProcessedExp.cam_id
-WHERE camProcessedExp.chip_id = chipRun.chip_id
-WHERE chipRun.exp_id = rawExp.exp_id
-
-OP   OP1  $rawExp.ra * 57.295783
-OP   OP2  $rawExp.decl * 57.295783
-
-#        field                        size format  name           show     link to         extras
-FIELD    chipRun.exp_id,               5,   %s,     Exp ID
-FIELD    rawExp.exp_name,              8,   %s,     Exp Name
-FIELD    chipRun.chip_id,              5,   %s,     Chip ID
-FIELD    camProcessedExp.cam_id,       5,   %s,     Cam ID
-FIELD    warpInputExp.warp_id,         5,   %s,     Warp ID
-FIELD    warpInputExp.magiced,         5,   %s,     magic?
-FIELD    rawExp.telescope,             8,   %s,     Telescope
-FIELD    rawExp.camera,                8,   %s,     Camera
-FIELD    rawExp.dateobs,              19,   %T,     Date/Time
-FIELD    rawExp.ra,                    8,   %10.6f, RA,           op=OP1      
-FIELD    rawExp.decl,                  8,   %10.6f, DEC,          op=OP2
-FIELD    rawExp.object,                8,   %s,     Object
-FIELD    rawExp.filter,               10,   %s,     Filter
-FIELD    rawExp.exp_time,              5,   %.2f,   exptime    
-FIELD    rawExp.airmass,               5,   %.4f,   airmass
-FIELD    rawExp.bg,                    5,   %.2f,   bg
-FIELD    rawExp.bg_stdev,              5,   %.2f,   bg_stdev
Index: trunk/ippMonitor/def/warpRun.d
===================================================================
--- trunk/ippMonitor/def/warpRun.d	(revision 19157)
+++ 	(revision )
@@ -1,12 +1,0 @@
-TABLE warpRun
-TITLE warpRun
-FILE  warpRun.php
-MENU  ipp.science.dat
-
-#        field          size  format  name           show     link to         extras
-FIELD    warp_id,	 8,   %s,     warp ID
-FIELD    mode,	 	 5,   %s,     mode
-FIELD    state,		 5,   %s,     state
-FIELD    workdir,        8,   %s,     workdir
-FIELD    dvodb,		 8,   %s,     DVO database
-FIELD    registered,     8,   %s,     time registered
Index: trunk/ippMonitor/def/warpSkycellMap.d
===================================================================
--- trunk/ippMonitor/def/warpSkycellMap.d	(revision 19157)
+++ trunk/ippMonitor/def/warpSkycellMap.d	(revision 19183)
@@ -19,4 +19,5 @@
 FIELD    warpSkyCellMap.warp_id,      5,    %s,     Warp ID
 FIELD    warpRun.state,               5,    %s,     State
+FIELD    warpRun.label,               5,    %s,     Label
 FIELD    warpSkyCellMap.skycell_id,   5,    %s,     Skycell ID
 FIELD    warpSkyCellMap.tess_id,      5,    %s,     Tessellation ID
Index: trunk/ippMonitor/def/warpStageExp.d
===================================================================
--- trunk/ippMonitor/def/warpStageExp.d	(revision 19157)
+++ trunk/ippMonitor/def/warpStageExp.d	(revision 19183)
@@ -26,4 +26,5 @@
 FIELD warpRun.warp_id,    	 7, %d,     Warp ID,      value,  warpStageExp.php,        ARG5
 FIELD warpRun.state,    	 7, %s,     state
+FIELD warpRun.label,    	 7, %s,     label
 FIELD rawExp.telescope,      	10, %s,     Telescope
 FIELD rawExp.camera,         	10, %s,     Camera
Index: trunk/ippMonitor/def/warpStageSkyfileInputs.d
===================================================================
--- trunk/ippMonitor/def/warpStageSkyfileInputs.d	(revision 19157)
+++ trunk/ippMonitor/def/warpStageSkyfileInputs.d	(revision 19183)
@@ -36,4 +36,5 @@
 FIELD warpRun.warp_id,    	  7, %d,     Warp ID,      value,  warpStageExp.php, ARG5
 FIELD warpRun.state,    	  7, %s,     state
+FIELD warpRun.label,    	  7, %s,     label
 FIELD warpSkyCellMap.skycell_id, 10, %s,     skycell
 FIELD warpSkyCellMap.tess_id,    10, %s,     tess
Index: trunk/ippMonitor/def/warpStageSkyfiles.d
===================================================================
--- trunk/ippMonitor/def/warpStageSkyfiles.d	(revision 19157)
+++ trunk/ippMonitor/def/warpStageSkyfiles.d	(revision 19183)
@@ -29,4 +29,5 @@
 FIELD warpSkyCellMap.skycell_id, 10, %s,     skycell,      value,  warpProcessedSkyfiles.php, ARG6
 FIELD warpRun.state,    	  7, %s,     state
+FIELD warpRun.label,    	  7, %s,     label
 FIELD warpSkyCellMap.tess_id,    10, %s,     tess
 FIELD warpSkyCellMap.fault,      10, %s,     fault
