Index: /trunk/dbconfig/config.md =================================================================== --- /trunk/dbconfig/config.md (revision 12128) +++ /trunk/dbconfig/config.md (revision 12129) @@ -2,4 +2,4 @@ pkg_name STR ippdb pkg_namespace STR ippdb - pkg_version STR 1.1.13 + pkg_version STR 1.1.14 END Index: /trunk/dbconfig/p4.md =================================================================== --- /trunk/dbconfig/p4.md (revision 12128) +++ /trunk/dbconfig/p4.md (revision 12129) @@ -1,3 +1,3 @@ -# $Id: p4.md,v 1.18 2007-02-24 02:46:19 jhoblitt Exp $ +# $Id: p4.md,v 1.19 2007-03-01 04:43:18 jhoblitt Exp $ # @@ -10,5 +10,5 @@ # define a new warprun for a single skycell warpRun METADATA - warp_id S32 0 # Primary Key AUTO_INCREMENT + warp_id S64 0 # Primary Key AUTO_INCREMENT mode STR 64 # Key state STR 64 # Key @@ -25,7 +25,6 @@ # 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 - cam_version S32 0 # Key + warp_id S64 0 # Primary Key + cam_id S64 0 # Primary Key # if magic is T then look for the exp_tag in the magic output tables magiced BOOL f # Key @@ -33,9 +32,8 @@ warpSkyCellMap METADATA - warp_id S32 0 # Primary Key + warp_id S64 0 # Primary Key skycell_id STR 64 # Primary Key tess_id STR 64 # Primary Key - exp_tag STR 64 # Primary Key - cam_version S32 0 # Primary Key + cam_id S64 0 # Primary Key # class is not yet consistently carried through pXtools # class STR 64 # Primary Key @@ -45,5 +43,5 @@ warpSkyfile METADATA - warp_id S32 0 # Primary Key + warp_id S64 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 12128) +++ /trunk/dbconfig/p5.md (revision 12129) @@ -1,6 +1,6 @@ -# $Id: p5.md,v 1.8 2007-02-24 02:29:51 jhoblitt Exp $ +# $Id: p5.md,v 1.9 2007-03-01 04:43:18 jhoblitt Exp $ diffRun METADATA - diff_id S32 0 # Primary Key AUTO_INCREMENT + diff_id S64 0 # Primary Key AUTO_INCREMENT state STR 64 # Key workdir STR 255 @@ -17,6 +17,6 @@ # only ever 2 per run diffInputSkyfile METADATA - diff_id S32 0 # Primary Key - warp_id S32 0 # Primary Key + diff_id S64 0 # Primary Key + warp_id S64 0 # Primary Key skycell_id STR 64 # Primary Key tess_id STR 64 # Primary Key @@ -27,5 +27,5 @@ diffSkyfile METADATA - diff_id S32 0 # Primary Key + diff_id S64 0 # Primary Key uri STR 255 bg F64 0.0 Index: /trunk/dbconfig/p6.md =================================================================== --- /trunk/dbconfig/p6.md (revision 12128) +++ /trunk/dbconfig/p6.md (revision 12129) @@ -1,6 +1,6 @@ -# $Id: p6.md,v 1.8 2007-02-24 02:29:51 jhoblitt Exp $ +# $Id: p6.md,v 1.9 2007-03-01 04:43:18 jhoblitt Exp $ stackRun METADATA - stack_id S32 0 # Primary Key AUTO_INCREMENT + stack_id S64 0 # Primary Key AUTO_INCREMENT state STR 64 # Key workdir STR 255 @@ -12,12 +12,12 @@ stackInputSkyfile METADATA - stack_id S32 0 # Primary Key - warp_id S32 0 # Primary Key + stack_id S64 0 # Primary Key + warp_id S64 0 # Primary Key END stackSumSkyfile METADATA - stack_id S32 0 # Primary Key + stack_id S64 0 # Primary Key uri STR 255 bg F64 0.0 - bg_stdev F64 0.0 + bg_stdev F64 0.0 END Index: /trunk/dbconfig/tasks.md =================================================================== --- /trunk/dbconfig/tasks.md (revision 12128) +++ /trunk/dbconfig/tasks.md (revision 12129) @@ -1,3 +1,3 @@ -# $Id: tasks.md,v 1.122 2007-02-28 21:48:12 jhoblitt Exp $ +# $Id: tasks.md,v 1.123 2007-03-01 04:43:18 jhoblitt Exp $ # this table records all exposure ID ever seen from the summit @@ -155,6 +155,6 @@ guidePendingExp METADATA - exp_tag STR 64 # Primary Key - guide_version S32 0 # Primary Key + guide_id S64 0 # Primary Key AUTO_INCREMENT + exp_tag STR 64 # Key recipe STR 64 END @@ -164,7 +164,7 @@ chipPendingExp METADATA - exp_tag STR 64 # Primary Key - chip_version S32 0 # Primary Key - guide_version S32 0 + chip_id S64 0 # Primary Key AUTO_INCREMENT + exp_tag STR 64 # Primary Key + guide_id S64 0 # Not NULL label STR 64 # key recipe STR 64 @@ -176,7 +176,7 @@ chipPendingImfile METADATA - exp_tag STR 64 # Primary Key - chip_version S32 0 # Primary Key - guide_version S32 0 + chip_id S64 0 # Primary Key + exp_tag STR 64 # Primary Key + guide_id S64 0 # Not NULL class_id STR 64 # Primary Key recipe STR 64 @@ -188,39 +188,7 @@ 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 - dvodb STR 255 -END - -chipMask METADATA - label STR 64 # Primary Key -END - -# uris in & out ? -# state? - -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 - uri STR 255 - bg F64 0.0 - bg_stdev F64 0.0 - bg_mean_stdev F64 0.0 - path_base STR 255 - fault S16 0 # Key NOT NULL -END - -# imfiles is not here... is it needed? - -camPendingExp METADATA - exp_tag STR 64 # Primary Key - cam_version S32 0 # Primary Key - chip_version S32 0 + chip_id S64 0 # Primary Key + exp_tag STR 64 # Primary Key + guide_id S64 0 # Not NULL label STR 64 # key expgroup STR 64 # key @@ -228,8 +196,42 @@ END +chipMask METADATA + label STR 64 # Primary Key +END + +# uris in & out ? +# state? + +chipProcessedImfile METADATA + chip_id S64 0 # Primary Key +# exp_tag/guide_id are redudant with the values stored in chipProcessedExp. +# exp_tag can be removed at virtually any time (SQL queriers will need to be +# fixed) but guide_id needs to wait until we know if this can be tracked at +# just the exp level. + exp_tag STR 64 # Primary Key + guide_id S64 0 # Not NULL + class_id STR 64 # Primary Key + recipe STR 64 + uri STR 255 + bg F64 0.0 + bg_stdev F64 0.0 + bg_mean_stdev F64 0.0 + path_base STR 255 + fault S16 0 # Key NOT NULL +END + +# imfiles is not here... is it needed? + +camPendingExp METADATA + cam_id S64 0 # Primary Key AUTO_INCREMENT + chip_id S64 0 # Primary Key + label STR 64 # key + expgroup STR 64 # key + dvodb STR 255 +END + camProcessedExp METADATA - exp_tag STR 64 # Primary Key - cam_version S32 0 # Primary Key - chip_version S32 0 + cam_id S64 0 # Primary Key + chip_id S64 0 # Primary Key label STR 64 # key uri STR 255 @@ -254,5 +256,5 @@ detRun METADATA - det_id S32 0 # Primary Key AUTO_INCREMENT + det_id S64 0 # Primary Key AUTO_INCREMENT iteration S32 0 # Key det_type STR 64 # Key @@ -284,5 +286,5 @@ detInputExp METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key iteration S32 0 # Primary Key exp_tag STR 64 # Primary Key @@ -291,5 +293,5 @@ detProcessedImfile METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key exp_tag STR 64 # Primary Key class_id STR 64 # Primary Key @@ -304,5 +306,5 @@ detProcessedExp METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key exp_tag STR 64 # Primary Key recipe STR 64 @@ -315,5 +317,5 @@ detStackedImfile METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key iteration S32 0 # Primary Key class_id STR 64 # Primary Key @@ -327,5 +329,5 @@ detNormalizedStatImfile METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key iteration S32 0 # Primary Key class_id STR 64 # Primary Key @@ -335,5 +337,5 @@ detNormalizedImfile METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key iteration S32 0 # Primary Key class_id STR 64 # Primary Key @@ -347,5 +349,5 @@ detNormalizedExp METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key iteration S32 0 # Primary Key recipe STR 64 @@ -358,5 +360,5 @@ #detMasterFrame METADATA -# det_id S32 0 # Primary Key +# det_id S64 0 # Primary Key # iteration S32 0 # Primary Key # comment STR 255 @@ -365,5 +367,5 @@ ## drop? #detMasterImfile METADATA -# det_id S32 0 # Primary Key +# det_id S64 0 # Primary Key # class_id STR 64 # Primary Key # uri STR 255 @@ -372,5 +374,5 @@ detResidImfile METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key iteration S32 0 # Primary Key exp_tag STR 64 # Primary Key @@ -386,5 +388,5 @@ detResidExp METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key iteration S32 0 # Primary Key exp_tag STR 64 # Primary Key @@ -399,5 +401,5 @@ detRunSummary METADATA - det_id S32 0 # Primary Key + det_id S64 0 # Primary Key iteration S32 0 # Primary Key bg F64 0.0