Index: trunk/dbconfig/diff.md
===================================================================
--- trunk/dbconfig/diff.md	(revision 20061)
+++ trunk/dbconfig/diff.md	(revision 20973)
@@ -1,14 +1,14 @@
-# $Id: diff.md,v 1.14 2008-10-11 02:33:40 price Exp $
+# $Id: diff.md,v 1.15 2008-12-13 20:17:34 bills Exp $
 
 diffRun METADATA
     diff_id     S64         0       # Primary Key AUTO_INCREMENT
     state       STR         64      # Key
+    workdir     STR         255
     label       STR         64      # Key
     reduction   STR         64      # Reduction class
-    workdir     STR         255
     dvodb       STR         255
     registered  TAI         NULL
-    skycell_id  STR         64      # Key
     tess_id     STR         64      # Key
+    exp_id      S64         0       # fkey(exp_id) ref rawExp(exp_id)
 END
 
@@ -17,18 +17,17 @@
 #
 
-# only ever 2 per run - one template / one not
 diffInputSkyfile METADATA
     diff_id     S64         0       # Primary Key fkey(diff_id) ref diffRun(diff_id)
-    template    BOOL        f       # Primary Key
-    stack_id    S64         0       # fkey(stack_id) ref stackSumSkyfile(stack_id) 
-    warp_id     S64         0       # fkey(warp_id, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
-    skycell_id  STR         64      # Key
+    skycell_id  STR         64      # Primary Key
+    warp1       S64         0       # fkey(warp1, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
+    stack1      S64         0       # fkey(stack1) ref stackSumSkyfile(stack_id) 
+    warp2       S64         0       # fkey(warp2, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
+    stack2      S64         0       # fkey(stack2) ref stackSumSkyfile(stack_id) 
     tess_id     STR         64      # Key
-# either a input or a template
-    kind        STR         64      # Key 
 END
 
 diffSkyfile METADATA
     diff_id      S64        0       # Primary Key fkey(diff_id) ref diffRun(diff_id)
+    skycell_id   STR        64      # 
     uri          STR        255
     path_base    STR        255
@@ -53,3 +52,5 @@
     good_frac    F32        0.0     # Key
     fault        S16        0       # Key
+    diff_image_id S64       0       # Key NOT NULL AUTO_INCREMENT
+    magicked     BOOL       f
 END