Index: /trunk/dbconfig/config.md =================================================================== --- /trunk/dbconfig/config.md (revision 11778) +++ /trunk/dbconfig/config.md (revision 11779) @@ -2,4 +2,4 @@ pkg_name STR ippdb pkg_namespace STR ippdb - pkg_version STR 1.1.4 + pkg_version STR 1.1.5 END Index: /trunk/dbconfig/ipp.m4 =================================================================== --- /trunk/dbconfig/ipp.m4 (revision 11778) +++ /trunk/dbconfig/ipp.m4 (revision 11779) @@ -10,3 +10,3 @@ include(tasks.md) include(p4.md) -include(skycell.md) +dnl include(skycell.md) Index: /trunk/dbconfig/p4.md =================================================================== --- /trunk/dbconfig/p4.md (revision 11778) +++ /trunk/dbconfig/p4.md (revision 11779) @@ -1,3 +1,3 @@ -# $Id: p4.md,v 1.10 2007-02-09 01:17:50 jhoblitt Exp $ +# $Id: p4.md,v 1.11 2007-02-13 22:33:30 jhoblitt Exp $ # @@ -10,5 +10,5 @@ # define a new p4run for a single skycell p4Run METADATA - p4a_id S32 0 # Primary Key AUTO_INCREMENT + p4_id S32 0 # Primary Key AUTO_INCREMENT mode STR 64 # Key state STR 64 # Key @@ -23,5 +23,5 @@ # the list of imfiles in our skycell keyed against phase 3 p4InputExp METADATA - p4a_id S32 0 # Primary Key + p4_id S32 0 # Primary Key exp_tag STR 64 # Primary Key p3_version S32 0 # Primary Key @@ -30,6 +30,17 @@ END +p4SkyCellMap METADATA + p4_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 +# class is not yet consistently carried through pXtools +# class STR 64 # Primary Key + class_id STR 64 # Primary Key +END + p4Scfile METADATA - p4a_id S32 0 # Primary Key + p4_id S32 0 # Primary Key skycell_id STR 64 # Primary Key tess_id STR 64 # Primary Key @@ -41,111 +52,2 @@ END -# -# Diff Sky Cells Mode -# - -# only ever 2 per run -p4InputScfile METADATA - p4b_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 -# either a input or a template - kind STR 64 # Key -END - -p4DiffScfile METADATA - p4b_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 - uri STR 255 - bg F64 0.0 - bg_mean_stdev F64 0.0 -END - -# -# Feed imfiles to Magic Mode -# - -# also uses p4InputExp - -# output from magic -p4MagicMaskImfile METADATA - p4c_id S32 0 # Primary Key - exp_tag STR 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 - -# output from magic -# p4MagicMaskImfile METADATA -# p4_id S32 0 # Primary Key -# exp_tag STR 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_tag STR 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_tag STR 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_tag STR 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_tag STR 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 Index: /trunk/dbconfig/p5.md =================================================================== --- /trunk/dbconfig/p5.md (revision 11779) +++ /trunk/dbconfig/p5.md (revision 11779) @@ -0,0 +1,111 @@ +# $Id: p5.md,v 1.1 2007-02-13 22:33:30 jhoblitt Exp $ + +# +# Diff Sky Cells Mode +# + +# only ever 2 per run +p4InputScfile METADATA + p4_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 +# either a input or a template + kind STR 64 # Key +END + +p4DiffScfile METADATA + p4_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 + uri STR 255 + bg F64 0.0 + bg_mean_stdev F64 0.0 +END + +# +# Feed imfiles to Magic Mode +# + +# also uses p4InputExp + +# output from magic +p4MagicMaskImfile METADATA + p4_id S32 0 # Primary Key + exp_tag STR 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 + +# output from magic +# p4MagicMaskImfile METADATA +# p4_id S32 0 # Primary Key +# exp_tag STR 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_tag STR 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_tag STR 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_tag STR 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_tag STR 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 Index: /trunk/dbconfig/skycell.md =================================================================== --- /trunk/dbconfig/skycell.md (revision 11778) +++ /trunk/dbconfig/skycell.md (revision 11779) @@ -1,3 +1,3 @@ -# $Id: skycell.md,v 1.2 2007-02-06 02:37:40 jhoblitt Exp $ +# $Id: skycell.md,v 1.3 2007-02-13 22:33:30 jhoblitt Exp $ skyCell METADATA @@ -18,4 +18,5 @@ tess_id STR 64 # Primary Key exp_tag STR 64 # Primary Key + p3_version S32 0 # Primary Key # class is not yet consistently carried through pXtools # class STR 64 # Primary Key