Index: trunk/dbconfig/cam.md =================================================================== --- trunk/dbconfig/cam.md (revision 12531) +++ trunk/dbconfig/cam.md (revision 12531) @@ -0,0 +1,36 @@ +# imfiles is not here... is it needed? + +camPendingExp METADATA + cam_id S64 0 # Primary Key AUTO_INCREMENT + chip_id S64 0 # Primary Key + workdir STR 255 + label STR 64 # key + recipe STR 64 + expgroup STR 64 # key + dvodb STR 255 +END + +camProcessedExp METADATA + cam_id S64 0 # Primary Key + chip_id S64 0 # Primary Key + workdir STR 255 + label STR 64 # key + recipe STR 64 + expgroup STR 64 # key + dvodb STR 255 + uri STR 255 + bg F64 0.0 + bg_stdev F64 0.0 + bg_mean_stdev F64 0.0 + sigma_ra F32 0.0 + sigma_dec F32 0.0 + nastro S32 0 + path_base STR 255 + zp_mean F32 0.0 + zp_stdev F32 0.0 + fault S16 0 # Key NOT NULL +END + +camMask METADATA + label STR 64 # Primary Key +END Index: trunk/dbconfig/chip.md =================================================================== --- trunk/dbconfig/chip.md (revision 12531) +++ trunk/dbconfig/chip.md (revision 12531) @@ -0,0 +1,57 @@ +# do we need nclass? +# class is missing + +chipPendingExp METADATA + chip_id S64 0 # Primary Key AUTO_INCREMENT + exp_tag STR 64 # Primary Key + guide_id S64 0 # Not NULL + workdir STR 255 + label STR 64 # key + recipe STR 64 + expgroup STR 64 # key + dvodb STR 255 +END + +# uris in & out ? + +chipPendingImfile METADATA + chip_id S64 0 # Primary Key + class_id STR 64 # Primary Key + uri STR 255 +END + +# nclass & ndone? +# and/or logging imfile done better? + +chipProcessedExp METADATA + chip_id S64 0 # Primary Key + exp_tag STR 64 # Primary Key + guide_id S64 0 # Not NULL + workdir STR 255 + label STR 64 # key + recipe STR 64 + expgroup STR 64 # key + dvodb STR 255 +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. + class_id STR 64 # Primary Key + 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 Index: trunk/dbconfig/det.md =================================================================== --- trunk/dbconfig/det.md (revision 12531) +++ trunk/dbconfig/det.md (revision 12531) @@ -0,0 +1,155 @@ +detRun METADATA + det_id S64 0 # Primary Key AUTO_INCREMENT + iteration S32 0 # Key + det_type STR 64 # Key + mode STR 64 # Key + state STR 64 # Key + filelevel STR 64 + workdir STR 255 # destination for output files + camera STR 64 + telescope STR 64 + exp_type STR 64 # XXX this should be dropped + filter STR 64 + airmass_min F32 0.0 + airmass_max F32 0.0 + exp_time_min F32 0.0 + exp_time_max F32 0.0 + ccd_temp_min F32 0.0 + ccd_temp_max F32 0.0 + posang_min F64 0.0 + posang_max F64 0.0 + registered TAI 0001-01-01T00:00:00Z + time_begin TAI 0001-01-01T00:00:00Z + time_end TAI 0001-01-01T00:00:00Z + use_begin TAI 0001-01-01T00:00:00Z + use_end TAI 0001-01-01T00:00:00Z + solang_min F32 0.0 + solang_max F32 0.0 + label STR 64 # key + parent S32 0 # Key +END + +detInputExp METADATA + det_id S64 0 # Primary Key + iteration S32 0 # Primary Key + exp_tag STR 64 # Primary Key + include BOOL f +END + +detProcessedImfile METADATA + det_id S64 0 # Primary Key + exp_tag STR 64 # Primary Key + class_id STR 64 # Primary Key + uri STR 255 + recipe STR 64 + 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 + +detProcessedExp METADATA + det_id S64 0 # Primary Key + exp_tag STR 64 # Primary Key + recipe STR 64 + 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 + +detStackedImfile METADATA + det_id S64 0 # Primary Key + iteration S32 0 # Primary Key + class_id STR 64 # Primary Key + uri STR 255 + recipe STR 64 + bg F64 0.0 + bg_stdev F64 0.0 + bg_mean_stdev F64 0.0 + fault S16 0 # Key NOT NULL +END + +detNormalizedStatImfile METADATA + det_id S64 0 # Primary Key + iteration S32 0 # Primary Key + class_id STR 64 # Primary Key + norm F32 0.0 + fault S16 0 # Key NOT NULL +END + +detNormalizedImfile METADATA + det_id S64 0 # Primary Key + iteration S32 0 # Primary Key + class_id STR 64 # Primary Key + 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 + +detNormalizedExp METADATA + det_id S64 0 # Primary Key + iteration S32 0 # Primary Key + recipe STR 64 + 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 + +#detMasterFrame METADATA +# det_id S64 0 # Primary Key +# iteration S32 0 # Primary Key +# comment STR 255 +#END +# +## drop? +#detMasterImfile METADATA +# det_id S64 0 # Primary Key +# class_id STR 64 # Primary Key +# uri STR 255 +# recipe STR 64 +#END + +detResidImfile METADATA + det_id S64 0 # Primary Key + iteration S32 0 # Primary Key + exp_tag STR 64 # Primary Key + class_id STR 64 # Primary Key + uri STR 255 + recipe STR 64 + 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 + +detResidExp METADATA + det_id S64 0 # Primary Key + iteration S32 0 # Primary Key + exp_tag STR 64 # Primary Key + recipe STR 64 + bg F64 0.0 + bg_stdev F64 0.0 + bg_mean_stdev F64 0.0 + path_base STR 255 + accept BOOL f + fault S16 0 # Key NOT NULL +END + +detRunSummary METADATA + det_id S64 0 # Primary Key + iteration S32 0 # Primary Key + bg F64 0.0 + bg_stdev F64 0.0 + bg_mean_stdev F64 0.0 + accept BOOL f + fault S16 0 # Key NOT NULL +END Index: trunk/dbconfig/diff.md =================================================================== --- trunk/dbconfig/diff.md (revision 12531) +++ trunk/dbconfig/diff.md (revision 12531) @@ -0,0 +1,33 @@ +# $Id: diff.md,v 1.1 2007-03-22 01:10:12 jhoblitt Exp $ + +diffRun METADATA + diff_id S64 0 # Primary Key AUTO_INCREMENT + state STR 64 # Key + workdir STR 255 + dvodb STR 255 + registered TAI NULL + skycell_id STR 64 # Key + tess_id STR 64 # Key +END + +# +# Diff Sky Cells Mode +# + +# only ever 2 per run +diffInputSkyfile METADATA + diff_id S64 0 # Primary Key + warp_id S64 0 # Primary Key + skycell_id STR 64 # Primary Key + tess_id STR 64 # Primary Key +# either a input or a template + kind STR 64 # Key + template BOOL f +END + +diffSkyfile METADATA + diff_id S64 0 # Primary Key + uri STR 255 + bg F64 0.0 + bg_stdev F64 0.0 +END Index: trunk/dbconfig/guide.md =================================================================== --- trunk/dbconfig/guide.md (revision 12531) +++ trunk/dbconfig/guide.md (revision 12531) @@ -0,0 +1,5 @@ +guidePendingExp METADATA + guide_id S64 0 # Primary Key AUTO_INCREMENT + exp_tag STR 64 # Key + recipe STR 64 +END Index: trunk/dbconfig/ipp.m4 =================================================================== --- trunk/dbconfig/ipp.m4 (revision 12425) +++ trunk/dbconfig/ipp.m4 (revision 12531) @@ -9,6 +9,10 @@ dnl include(telescope.md) include(tasks.md) -include(p4.md) -include(p5.md) -include(p6.md) +include(guide.md) +include(chip.md) +include(cam.md) +include(warp.md) +include(diff.md) +include(stack.md) +include(det.md) dnl include(skycell.md) Index: trunk/dbconfig/p4.md =================================================================== --- trunk/dbconfig/p4.md (revision 12425) +++ (revision ) @@ -1,52 +1,0 @@ -# $Id: p4.md,v 1.19 2007-03-01 04:43:18 jhoblitt Exp $ - -# -# We have at least 3 different run types -# a) single epoch differing -# b) magic run operates on "complete" exposures -# c) multiple epoch differing/stacking operations -# - -# define a new warprun for a single skycell -warpRun METADATA - warp_id S64 0 # Primary Key AUTO_INCREMENT - mode STR 64 # Key - state STR 64 # Key - workdir STR 255 - dvodb STR 255 - registered TAI NULL -END - -# -# Warp to Sky Cell Mode -# - -# the list of imfiles in our skycell keyed against phase 3 -# only allow one cam_version of an exp_tag per warpRun -warpInputExp METADATA - 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 -END - -warpSkyCellMap METADATA - warp_id S64 0 # Primary Key - skycell_id STR 64 # Primary Key - tess_id STR 64 # Primary Key - cam_id S64 0 # Primary Key -# class is not yet consistently carried through pXtools -# class STR 64 # Primary Key - class_id STR 64 # Primary Key - fault S16 0 # Key -END - -warpSkyfile METADATA - warp_id S64 0 # Primary Key - skycell_id STR 64 # Primary Key - tess_id STR 64 # Primary Key - uri STR 255 - bg F64 0.0 - bg_stdev F64 0.0 -END - Index: trunk/dbconfig/p5.md =================================================================== --- trunk/dbconfig/p5.md (revision 12425) +++ (revision ) @@ -1,33 +1,0 @@ -# $Id: p5.md,v 1.9 2007-03-01 04:43:18 jhoblitt Exp $ - -diffRun METADATA - diff_id S64 0 # Primary Key AUTO_INCREMENT - state STR 64 # Key - workdir STR 255 - dvodb STR 255 - registered TAI NULL - skycell_id STR 64 # Key - tess_id STR 64 # Key -END - -# -# Diff Sky Cells Mode -# - -# only ever 2 per run -diffInputSkyfile METADATA - diff_id S64 0 # Primary Key - warp_id S64 0 # Primary Key - skycell_id STR 64 # Primary Key - tess_id STR 64 # Primary Key -# either a input or a template - kind STR 64 # Key - template BOOL f -END - -diffSkyfile METADATA - diff_id S64 0 # Primary Key - uri STR 255 - bg F64 0.0 - bg_stdev F64 0.0 -END Index: trunk/dbconfig/p6.md =================================================================== --- trunk/dbconfig/p6.md (revision 12425) +++ (revision ) @@ -1,23 +1,0 @@ -# $Id: p6.md,v 1.9 2007-03-01 04:43:18 jhoblitt Exp $ - -stackRun METADATA - stack_id S64 0 # Primary Key AUTO_INCREMENT - state STR 64 # Key - workdir STR 255 - dvodb STR 255 - registered TAI NULL - skycell_id STR 64 # Key - tess_id STR 64 # Key -END - -stackInputSkyfile METADATA - stack_id S64 0 # Primary Key - warp_id S64 0 # Primary Key -END - -stackSumSkyfile METADATA - stack_id S64 0 # Primary Key - uri STR 255 - bg F64 0.0 - bg_stdev F64 0.0 -END Index: trunk/dbconfig/stack.md =================================================================== --- trunk/dbconfig/stack.md (revision 12531) +++ trunk/dbconfig/stack.md (revision 12531) @@ -0,0 +1,23 @@ +# $Id: stack.md,v 1.1 2007-03-22 01:10:12 jhoblitt Exp $ + +stackRun METADATA + stack_id S64 0 # Primary Key AUTO_INCREMENT + state STR 64 # Key + workdir STR 255 + dvodb STR 255 + registered TAI NULL + skycell_id STR 64 # Key + tess_id STR 64 # Key +END + +stackInputSkyfile METADATA + stack_id S64 0 # Primary Key + warp_id S64 0 # Primary Key +END + +stackSumSkyfile METADATA + stack_id S64 0 # Primary Key + uri STR 255 + bg F64 0.0 + bg_stdev F64 0.0 +END Index: trunk/dbconfig/tasks.md =================================================================== --- trunk/dbconfig/tasks.md (revision 12425) +++ trunk/dbconfig/tasks.md (revision 12531) @@ -1,3 +1,3 @@ -# $Id: tasks.md,v 1.131 2007-03-13 03:52:45 jhoblitt Exp $ +# $Id: tasks.md,v 1.132 2007-03-22 01:10:12 jhoblitt Exp $ # this table records all exposure ID ever seen from the summit @@ -157,259 +157,2 @@ # XXX - temporarily (???) stot carrying around class in imfiles after rawImfile # - -guidePendingExp METADATA - guide_id S64 0 # Primary Key AUTO_INCREMENT - exp_tag STR 64 # Key - recipe STR 64 -END - -# do we need nclass? -# class is missing - -chipPendingExp METADATA - chip_id S64 0 # Primary Key AUTO_INCREMENT - exp_tag STR 64 # Primary Key - guide_id S64 0 # Not NULL - workdir STR 255 - label STR 64 # key - recipe STR 64 - expgroup STR 64 # key - dvodb STR 255 -END - -# uris in & out ? - -chipPendingImfile METADATA - chip_id S64 0 # Primary Key - class_id STR 64 # Primary Key - uri STR 255 -END - -# nclass & ndone? -# and/or logging imfile done better? - -chipProcessedExp METADATA - chip_id S64 0 # Primary Key - exp_tag STR 64 # Primary Key - guide_id S64 0 # Not NULL - workdir STR 255 - label STR 64 # key - recipe STR 64 - expgroup STR 64 # key - dvodb STR 255 -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. - class_id STR 64 # Primary Key - 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 - workdir STR 255 - label STR 64 # key - recipe STR 64 - expgroup STR 64 # key - dvodb STR 255 -END - -camProcessedExp METADATA - cam_id S64 0 # Primary Key - chip_id S64 0 # Primary Key - workdir STR 255 - label STR 64 # key - recipe STR 64 - expgroup STR 64 # key - dvodb STR 255 - uri STR 255 - bg F64 0.0 - bg_stdev F64 0.0 - bg_mean_stdev F64 0.0 - sigma_ra F32 0.0 - sigma_dec F32 0.0 - nastro S32 0 - path_base STR 255 - zp_mean F32 0.0 - zp_stdev F32 0.0 - fault S16 0 # Key NOT NULL -END - -camMask METADATA - label STR 64 # Primary Key -END - -detRun METADATA - det_id S64 0 # Primary Key AUTO_INCREMENT - iteration S32 0 # Key - det_type STR 64 # Key - mode STR 64 # Key - state STR 64 # Key - filelevel STR 64 - workdir STR 255 # destination for output files - camera STR 64 - telescope STR 64 - exp_type STR 64 # XXX this should be dropped - filter STR 64 - airmass_min F32 0.0 - airmass_max F32 0.0 - exp_time_min F32 0.0 - exp_time_max F32 0.0 - ccd_temp_min F32 0.0 - ccd_temp_max F32 0.0 - posang_min F64 0.0 - posang_max F64 0.0 - registered TAI 0001-01-01T00:00:00Z - time_begin TAI 0001-01-01T00:00:00Z - time_end TAI 0001-01-01T00:00:00Z - use_begin TAI 0001-01-01T00:00:00Z - use_end TAI 0001-01-01T00:00:00Z - solang_min F32 0.0 - solang_max F32 0.0 - label STR 64 # key - parent S32 0 # Key -END - -detInputExp METADATA - det_id S64 0 # Primary Key - iteration S32 0 # Primary Key - exp_tag STR 64 # Primary Key - include BOOL f -END - -detProcessedImfile METADATA - det_id S64 0 # Primary Key - exp_tag STR 64 # Primary Key - class_id STR 64 # Primary Key - uri STR 255 - recipe STR 64 - 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 - -detProcessedExp METADATA - det_id S64 0 # Primary Key - exp_tag STR 64 # Primary Key - recipe STR 64 - 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 - -detStackedImfile METADATA - det_id S64 0 # Primary Key - iteration S32 0 # Primary Key - class_id STR 64 # Primary Key - uri STR 255 - recipe STR 64 - bg F64 0.0 - bg_stdev F64 0.0 - bg_mean_stdev F64 0.0 - fault S16 0 # Key NOT NULL -END - -detNormalizedStatImfile METADATA - det_id S64 0 # Primary Key - iteration S32 0 # Primary Key - class_id STR 64 # Primary Key - norm F32 0.0 - fault S16 0 # Key NOT NULL -END - -detNormalizedImfile METADATA - det_id S64 0 # Primary Key - iteration S32 0 # Primary Key - class_id STR 64 # Primary Key - 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 - -detNormalizedExp METADATA - det_id S64 0 # Primary Key - iteration S32 0 # Primary Key - recipe STR 64 - 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 - -#detMasterFrame METADATA -# det_id S64 0 # Primary Key -# iteration S32 0 # Primary Key -# comment STR 255 -#END -# -## drop? -#detMasterImfile METADATA -# det_id S64 0 # Primary Key -# class_id STR 64 # Primary Key -# uri STR 255 -# recipe STR 64 -#END - -detResidImfile METADATA - det_id S64 0 # Primary Key - iteration S32 0 # Primary Key - exp_tag STR 64 # Primary Key - class_id STR 64 # Primary Key - uri STR 255 - recipe STR 64 - 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 - -detResidExp METADATA - det_id S64 0 # Primary Key - iteration S32 0 # Primary Key - exp_tag STR 64 # Primary Key - recipe STR 64 - bg F64 0.0 - bg_stdev F64 0.0 - bg_mean_stdev F64 0.0 - path_base STR 255 - accept BOOL f - fault S16 0 # Key NOT NULL -END - -detRunSummary METADATA - det_id S64 0 # Primary Key - iteration S32 0 # Primary Key - bg F64 0.0 - bg_stdev F64 0.0 - bg_mean_stdev F64 0.0 - accept BOOL f - fault S16 0 # Key NOT NULL -END Index: trunk/dbconfig/warp.md =================================================================== --- trunk/dbconfig/warp.md (revision 12531) +++ trunk/dbconfig/warp.md (revision 12531) @@ -0,0 +1,52 @@ +# $Id: warp.md,v 1.1 2007-03-22 01:10:12 jhoblitt Exp $ + +# +# We have at least 3 different run types +# a) single epoch differing +# b) magic run operates on "complete" exposures +# c) multiple epoch differing/stacking operations +# + +# define a new warprun for a single skycell +warpRun METADATA + warp_id S64 0 # Primary Key AUTO_INCREMENT + mode STR 64 # Key + state STR 64 # Key + workdir STR 255 + dvodb STR 255 + registered TAI NULL +END + +# +# Warp to Sky Cell Mode +# + +# the list of imfiles in our skycell keyed against phase 3 +# only allow one cam_version of an exp_tag per warpRun +warpInputExp METADATA + warp_id S64 0 # Primary Key fkey(warp_id) ref warpRun(warp_id) + cam_id S64 0 # Primary Key fkey(cam_id) ref camProcessedExp(cam_id) +# if magic is T then look for the exp_tag in the magic output tables + magiced BOOL f # Key +END + +warpSkyCellMap METADATA + warp_id S64 0 # Primary Key + skycell_id STR 64 # Primary Key + tess_id STR 64 # Primary Key + cam_id S64 0 # Primary Key +# class is not yet consistently carried through pXtools +# class STR 64 # Primary Key + class_id STR 64 # Primary Key + fault S16 0 # Key +END + +warpSkyfile METADATA + warp_id S64 0 # Primary Key + skycell_id STR 64 # Primary Key + tess_id STR 64 # Primary Key + uri STR 255 + bg F64 0.0 + bg_stdev F64 0.0 +END +