Index: /trunk/dbconfig/config.md =================================================================== --- /trunk/dbconfig/config.md (revision 8281) +++ /trunk/dbconfig/config.md (revision 8282) @@ -2,3 +2,4 @@ pkg_name STR ippdb pkg_namespace STR ippdb + pkg_version STR 0.0.25 END Index: /trunk/dbconfig/tasks.md =================================================================== --- /trunk/dbconfig/tasks.md (revision 8281) +++ /trunk/dbconfig/tasks.md (revision 8282) @@ -1,3 +1,3 @@ -# $Id: tasks.md,v 1.54 2006-08-08 03:06:28 jhoblitt Exp $ +# $Id: tasks.md,v 1.55 2006-08-11 01:32:47 jhoblitt Exp $ # this table records all exposure ID ever seen from the summit @@ -5,4 +5,6 @@ # note that dec is a MySQL reserved word +# note that use is a MySQL reserved word +# note that exp is a MySQL reserved word summitExp METADATA @@ -28,9 +30,9 @@ # class_id == type set id pzPendingImfile METADATA - exp_id STR 64 # Key + exp_id STR 64 # Primary Key bytes S32 0 md5sum STR 32 class STR 64 - class_id STR 64 + class_id STR 64 # Primary Key uri STR 255 END @@ -45,7 +47,9 @@ END +# class needs to be carried here so it can go into rawImfile and be normalized +# from there newImfile METADATA exp_id STR 64 # Primary Key - class STR 64 # Primary Key + class STR 64 class_id STR 64 # Primary Key uri STR 255 @@ -59,32 +63,4 @@ exp_type STR 64 imfiles S32 0 - filter STR 255 - airmass F32 0.0 - ra F64 0.0 - decl F64 0.0 - exp_time F32 0.0 - background F64 0.0 -END - -# paired with rawImfile -rawScienceExp METADATA - exp_id STR 64 # Primary Key - camera STR 255 - telescope STR 255 - exp_type STR 64 - imfiles S32 0 - filter STR 255 - airmass F32 0.0 - ra F64 0.0 - decl F64 0.0 - exp_time F32 0.0 - background F64 0.0 -END - -rawImfile METADATA - exp_id STR 64 # Primary Key - class STR 64 # Primary Key - class_id STR 64 # Primary Key - uri STR 255 filter STR 255 airmass F32 0.0 @@ -101,10 +77,7 @@ END -# -# XXX - temporarily (???) stot carrying around class in imfiles after rawImfile -# - -p1PendingExp METADATA - exp_id STR 64 # Primary Key +# paired with rawImfile +rawScienceExp METADATA + exp_id STR 64 # Primary Key camera STR 255 telescope STR 255 @@ -116,50 +89,18 @@ decl F64 0.0 exp_time F32 0.0 - background F64 0.0 - recipe STR 64 - p1_version S32 0 -END - -# do we need nclass? -# class is missing - -p2PendingExp METADATA - exp_id STR 64 # Primary Key - camera STR 255 - telescope STR 255 - exp_type STR 64 - imfiles S32 0 - filter STR 255 - airmass F32 0.0 - ra F32 0.0 - decl F64 0.0 - exp_time F64 0.0 - background F64 0.0 - recipe STR 64 - p1_version S32 0 - p2_version S32 0 -END - -# uris in & out ? - -p2PendingImfile METADATA - exp_id STR 64 # Key -# class STR 64 - class_id STR 64 - uri STR 255 - recipe STR 64 - p1_version S32 0 - p2_version S32 0 -END - -# nclass & ndone? -# and/or logging imfile done better? - -p2DoneExp METADATA - exp_id STR 64 # Primary Key - camera STR 255 - telescope STR 255 - exp_type STR 64 - imfiles S32 0 + bg F64 0.0 + bg_stdev F64 0.0 + bg_mean_stdev F64 0.0 + alt F64 0.0 + az F64 0.0 + ccd_temp F32 0.0 + posang F64 0.0 +END + +rawImfile METADATA + exp_id STR 64 # Primary Key + class STR 64 + class_id STR 64 # Primary Key + uri STR 255 filter STR 255 airmass F32 0.0 @@ -167,5 +108,49 @@ decl F64 0.0 exp_time F32 0.0 - background F64 0.0 + bg F64 0.0 + bg_stdev F64 0.0 + bg_mean_stdev F64 0.0 + alt F64 0.0 + az F64 0.0 + ccd_temp F32 0.0 + posang F64 0.0 +END + +# +# XXX - temporarily (???) stot carrying around class in imfiles after rawImfile +# + +p1PendingExp METADATA + exp_id STR 64 # Primary Key + recipe STR 64 + p1_version S32 0 +END + +# do we need nclass? +# class is missing + +p2PendingExp METADATA + exp_id STR 64 # Primary Key + recipe STR 64 + p1_version S32 0 + p2_version S32 0 +END + +# uris in & out ? + +p2PendingImfile METADATA + exp_id STR 64 # Primary Key + class_id STR 64 # Primary Key + uri STR 255 + recipe STR 64 + p1_version S32 0 + p2_version S32 0 +END + +# nclass & ndone? +# and/or logging imfile done better? + +p2DoneExp METADATA + exp_id STR 64 # Primary Key recipe STR 64 p1_version S32 0 @@ -177,7 +162,6 @@ p2DoneImfile METADATA - exp_id STR 64 # Key -# class STR 64 - class_id STR 64 + exp_id STR 64 # Primary Key + class_id STR 64 # Primary Key uri STR 255 recipe STR 64 @@ -194,13 +178,4 @@ p3PendingExp METADATA exp_id STR 64 # Primary Key - camera STR 255 - exp_type STR 64 - imfiles S32 0 - filter STR 255 - airmass F32 0.0 - ra F64 0.0 - decl F64 0.0 - exp_time F32 0.0 - background F64 0.0 recipe STR 64 p2_version S32 0 @@ -217,14 +192,6 @@ iteration S32 0 # Primary Key exp_id STR 64 # Primary Key - camera STR 255 - telescope STR 255 - exp_type STR 64 - imfiles S32 0 - filter STR 255 - airmass F32 0.0 - ra F64 0.0 - decl F64 0.0 - exp_time F32 0.0 - background F64 0.0 + include BOOL f + accept BOOL f END @@ -283,4 +250,5 @@ exp_id STR 64 # Primary Key recipe STR 64 + keep BOOL f accept BOOL f END