Index: trunk/dbconfig/magic.md
===================================================================
--- trunk/dbconfig/magic.md	(revision 14479)
+++ trunk/dbconfig/magic.md	(revision 14483)
@@ -1,85 +1,34 @@
-# $Id: magic.md,v 1.2 2007-07-06 01:16:08 jhoblitt Exp $
+# $Id: magic.md,v 1.3 2007-08-14 04:04:30 jhoblitt Exp $
 
-#
-# Feed imfiles to Magic Mode
-#
+magicRun METADATA
+    magic_id    S64         0       # Primary Key AUTO_INCREMENT
+    state       STR         64      # Key
+    workdir     STR         255
+    workdir_state STR       255     # Key
+    label       STR         64      # key
+    dvodb       STR         255
+    registered  TAI         NULL
+END
 
-# also uses p4InputExp
+magicInputSkyfile METADATA
+    magic_id    S64         0       # Primary Key fkey(magic_id) ref magicRun(magic_id)
+    diff_id     S64         0       # Primary Key fkey(diff_id) ref diffRun(diff_id)
+    node        S32         0       # AUTO_INCREMENT
+END
 
-# output from magic
-p4MagicMaskImfile METADATA
-    p4_id       S32         0       # Primary Key
-    exp_id     S64         64      # Primary Key
-    p3_version  S32         0       # Primary Key
-# class is not yet consistently carried through pXtools
-#    class       STR         64      # Primary Key
-    class_id    STR         64      # Primary Key
+magicTree METADATA
+    magic_id    S64         0       # Primary Key fkey(magic_id) ref magicRun(magic_id)
+    node        STR         64 
+    dep         STR         64
+END
+
+magicNodeResult METADATA
+    magic_id    S64         0       # Primary Key fkey(magic_id) ref magicRun(magic_id)
+    node        STR         64 
     uri         STR         255
 END
 
-# output from magic
-# p4MagicMaskImfile METADATA
-#     p4_id       S32         0       # Primary Key
-#     exp_id     S64         64      # Primary Key
-#     p3_version  S32         0       # Primary Key
-# # class is not yet consistently carried through pXtools
-# #    class       STR         64      # Primary Key
-#     class_id    STR         64      # Primary Key
-#     uri         STR         255
-# END
-# 
-# # the list of imfiles in our skycell keyed against phase 3
-# p4InputImfile  METADATA
-#     p4_id       S32         0       # Primary Key
-#     skycell_id  STR         64      # Primary Key
-#     tess_id     STR         64      # Primary Key
-#     exp_id     S64         64      # Primary Key
-#     p3_version  S32         0       # Primary Key
-# # class is not yet consistently carried through pXtools
-# #    class       STR         64      # Primary Key
-#     class_id    STR         64      # Primary Key
-# # either a input or a template
-#     kind        STR         64      # Key 
-# END
-# 
-# 
-# # one diff image per input to the current stack
-# # XXX how will diff against the static sky be handled?
-# p4DiffImfile METADATA
-#     p4_id       S32         0       # Primary Key
-#     skycell_id  STR         64      # Primary Key
-#     tess_id     STR         64      # Primary Key
-#     exp_id     S64         64      # Primary Key
-#     p3_version  S32         0       # Primary Key
-# # class is not yet consistently carried through pXtools
-# #    class       STR         64      # Primary Key
-#     class_id    STR         64      # Primary Key
-#     uri         STR         255
-#     bg          F64         0.0
-#     bg_mean_stdev   F64     0.0
-# END
-# 
-# p4StackedImfile METADATA
-#     p4_id       S32         0       # Primary Key
-#     skycell_id  STR         64      # Primary Key
-#     tess_id     STR         64      # Primary Key
-#     exp_id     S64         64      # Primary Key
-#     p3_version  S32         0       # Primary Key
-# # class is not yet consistently carried through pXtools
-# #    class       STR         64      # Primary Key
-#     class_id    STR         64      # Primary Key
-#     uri         STR         255
-#     bg          F64         0.0
-#     bg_mean_stdev   F64     0.0
-# END
-# 
-# # output from magic
-# p4MagicMaskImfile METADATA
-#     p4_id       S32         0       # Primary Key
-#     exp_id     S64         64      # Primary Key
-#     p3_version  S32         0       # Primary Key
-# # class is not yet consistently carried through pXtools
-# #    class       STR         64      # Primary Key
-#     class_id    STR         64      # Primary Key
-#     uri         STR         255
-# END
+magicMask METADATA
+    magic_id    S64         0       # Primary Key AUTO_INCREMENT
+    uri         STR         255
+END