Index: trunk/dbconfig/config.md =================================================================== --- trunk/dbconfig/config.md (revision 11984) +++ trunk/dbconfig/config.md (revision 12024) @@ -2,4 +2,4 @@ pkg_name STR ippdb pkg_namespace STR ippdb - pkg_version STR 1.1.10 + pkg_version STR 1.1.11 END Index: trunk/dbconfig/p4.md =================================================================== --- trunk/dbconfig/p4.md (revision 11984) +++ trunk/dbconfig/p4.md (revision 12024) @@ -1,3 +1,3 @@ -# $Id: p4.md,v 1.15 2007-02-22 01:54:56 jhoblitt Exp $ +# $Id: p4.md,v 1.16 2007-02-24 01:40:38 jhoblitt Exp $ # @@ -8,7 +8,7 @@ # -# define a new p4run for a single skycell -p4Run METADATA - p4_id S32 0 # Primary Key AUTO_INCREMENT +# define a new warprun for a single skycell +warpRun METADATA + warp_id S32 0 # Primary Key AUTO_INCREMENT mode STR 64 # Key state STR 64 # Key @@ -23,19 +23,19 @@ # the list of imfiles in our skycell keyed against phase 3 -# only allow one p3_version of an exp_tag per p4Run -p4InputExp METADATA - p4_id S32 0 # Primary Key +# only allow one cam_version of an exp_tag per warpRun +warpInputExp METADATA + warp_id S32 0 # Primary Key exp_tag STR 64 # Primary Key - p3_version S32 0 # Key + cam_version S32 0 # Key # if magic is T then look for the exp_tag in the magic output tables magiced BOOL f # Key END -p4SkyCellMap METADATA - p4_id S32 0 # Primary Key +warpSkyCellMap METADATA + warp_id S32 0 # Primary Key skycell_id STR 64 # Primary Key tess_id STR 64 # Primary Key exp_tag STR 64 # Primary Key - p3_version S32 0 # Primary Key + cam_version S32 0 # Primary Key # class is not yet consistently carried through pXtools # class STR 64 # Primary Key @@ -43,6 +43,6 @@ END -p4Skyfile METADATA - p4_id S32 0 # Primary Key +warpSkyfile METADATA + warp_id S32 0 # Primary Key skycell_id STR 64 # Primary Key tess_id STR 64 # Primary Key Index: trunk/dbconfig/p5.md =================================================================== --- trunk/dbconfig/p5.md (revision 11984) +++ trunk/dbconfig/p5.md (revision 12024) @@ -1,6 +1,6 @@ -# $Id: p5.md,v 1.6 2007-02-22 01:54:56 jhoblitt Exp $ +# $Id: p5.md,v 1.7 2007-02-24 01:40:38 jhoblitt Exp $ -p5Run METADATA - p5_id S32 0 # Primary Key AUTO_INCREMENT +diffRun METADATA + diff_id S32 0 # Primary Key AUTO_INCREMENT state STR 64 # Key workdir STR 255 @@ -16,7 +16,7 @@ # only ever 2 per run -p5InputSkyfile METADATA - p5_id S32 0 # Primary Key - p4_id S32 0 # Primary Key +diffInputSkyfile METADATA + diff_id S32 0 # Primary Key + warp_id S32 0 # Primary Key skycell_id STR 64 # Primary Key tess_id STR 64 # Primary Key @@ -26,6 +26,6 @@ END -p5DiffSkyfile METADATA - p5_id S32 0 # Primary Key +diffSkyfile METADATA + diff_id S32 0 # Primary Key uri STR 255 bg F64 0.0 Index: trunk/dbconfig/p6.md =================================================================== --- trunk/dbconfig/p6.md (revision 11984) +++ trunk/dbconfig/p6.md (revision 12024) @@ -1,6 +1,6 @@ -# $Id: p6.md,v 1.6 2007-02-22 01:54:56 jhoblitt Exp $ +# $Id: p6.md,v 1.7 2007-02-24 01:40:38 jhoblitt Exp $ -p6Run METADATA - p6_id S32 0 # Primary Key AUTO_INCREMENT +stackRun METADATA + stack_id S32 0 # Primary Key AUTO_INCREMENT state STR 64 # Key workdir STR 255 @@ -11,11 +11,11 @@ END -p6InputSkyfile METADATA - p6_id S32 0 # Primary Key - p4_id S32 0 # Primary Key +stackInputSkyfile METADATA + stack_id S32 0 # Primary Key + warp_id S32 0 # Primary Key END -p6SumSkyfile METADATA - p6_id S32 0 # Primary Key +stackSumSkyfile METADATA + stack_id S32 0 # Primary Key uri STR 255 bg F64 0.0 Index: trunk/dbconfig/tasks.md =================================================================== --- trunk/dbconfig/tasks.md (revision 11984) +++ trunk/dbconfig/tasks.md (revision 12024) @@ -1,3 +1,3 @@ -# $Id: tasks.md,v 1.119 2007-02-17 04:14:23 jhoblitt Exp $ +# $Id: tasks.md,v 1.120 2007-02-24 01:40:38 jhoblitt Exp $ # this table records all exposure ID ever seen from the summit @@ -154,7 +154,7 @@ # -p1PendingExp METADATA - exp_tag STR 64 # Primary Key - p1_version S32 0 # Primary Key +guidePendingExp METADATA + exp_tag STR 64 # Primary Key + guide_version S32 0 # Primary Key recipe STR 64 END @@ -163,8 +163,8 @@ # class is missing -p2PendingExp METADATA - exp_tag STR 64 # Primary Key - p2_version S32 0 # Primary Key - p1_version S32 0 +chipPendingExp METADATA + exp_tag STR 64 # Primary Key + chip_version S32 0 # Primary Key + guide_version S32 0 label STR 64 # key recipe STR 64 @@ -175,8 +175,8 @@ # uris in & out ? -p2PendingImfile METADATA - exp_tag STR 64 # Primary Key - p2_version S32 0 # Primary Key - p1_version S32 0 +chipPendingImfile METADATA + exp_tag STR 64 # Primary Key + chip_version S32 0 # Primary Key + guide_version S32 0 class_id STR 64 # Primary Key recipe STR 64 @@ -187,8 +187,8 @@ # and/or logging imfile done better? -p2ProcessedExp METADATA - exp_tag STR 64 # Primary Key - p2_version S32 0 # Primary Key - p1_version S32 0 +chipProcessedExp METADATA + exp_tag STR 64 # Primary Key + chip_version S32 0 # Primary Key + guide_version S32 0 label STR 64 # key expgroup STR 64 # key @@ -196,5 +196,5 @@ END -p2Mask METADATA +chipMask METADATA label STR 64 # Primary Key END @@ -203,8 +203,8 @@ # state? -p2ProcessedImfile METADATA - exp_tag STR 64 # Primary Key - p2_version S32 0 # Primary Key - p1_version S32 0 +chipProcessedImfile METADATA + exp_tag STR 64 # Primary Key + chip_version S32 0 # Primary Key + guide_version S32 0 class_id STR 64 # Primary Key recipe STR 64 @@ -220,8 +220,8 @@ # imfiles is not here... is it needed? -p3PendingExp METADATA - exp_tag STR 64 # Primary Key - p3_version S32 0 # Primary Key - p2_version S32 0 +camPendingExp METADATA + exp_tag STR 64 # Primary Key + cam_version S32 0 # Primary Key + chip_version S32 0 label STR 64 # key expgroup STR 64 # key @@ -229,8 +229,8 @@ END -p3ProcessedExp METADATA - exp_tag STR 64 # Primary Key - p3_version S32 0 # Primary Key - p2_version S32 0 +camProcessedExp METADATA + exp_tag STR 64 # Primary Key + cam_version S32 0 # Primary Key + chip_version S32 0 label STR 64 # key uri STR 255 @@ -251,5 +251,5 @@ END -p3Mask METADATA +camMask METADATA label STR 64 # Primary Key END