Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/Makefile.am =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/Makefile.am (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/Makefile.am (revision 31094) @@ -12,5 +12,8 @@ format_20090120.config \ format_20090220.config \ + format_20091209.config \ format_20100122.config \ + format_20100228.config \ + format_20100723.config \ format_mef.config \ format_relphot.config \ Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/camera.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/camera.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/camera.config (revision 31094) @@ -5,5 +5,8 @@ MEF STR gpc1/format_mef.config RELPHOT STR gpc1/format_relphot.config + RAW_20100723 STR gpc1/format_20100723.config + RAW_20100228 STR gpc1/format_20100228.config RAW_20100122 STR gpc1/format_20100122.config + RAW_20091209 STR gpc1/format_20091209.config RAW_20090220 STR gpc1/format_20090220.config RAW_20090120 STR gpc1/format_20090120.config Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20080925.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20080925.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20080925.config (revision 31094) @@ -604,3 +604,69 @@ # CELL.Y0 STR FORTRAN END - + +# PATTERN.CELL BOOL FALSE +# we want pattern row correction for all cell for all chips for all data < 2009-12-09 +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction + XY01 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY02 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY03 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY04 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY05 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY06 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY10 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY11 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY12 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY13 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY14 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY15 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY16 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY17 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY20 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY21 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY22 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY23 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY24 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY25 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY26 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY27 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY30 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY31 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY32 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY33 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY34 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY35 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY36 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY37 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY40 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY41 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY42 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY43 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY44 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY45 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY46 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY47 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY50 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY51 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY52 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY53 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY54 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY55 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY56 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY57 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY60 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY61 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY62 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY63 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY64 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY65 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY66 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY67 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY71 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY72 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY73 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY74 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY75 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY76 STR 1111111111111111111111111111111111111111111111111111111111111111 +END + Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20080929.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20080929.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20080929.config (revision 31094) @@ -599,2 +599,70 @@ END +# Pattern correction information: +# PATTERN.CELL BOOL FALSE +# we want pattern row correction for all cell for all chips for all data < 2009-12-09 + +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction + XY01 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY02 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY03 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY04 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY05 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY06 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY10 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY11 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY12 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY13 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY14 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY15 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY16 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY17 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY20 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY21 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY22 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY23 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY24 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY25 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY26 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY27 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY30 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY31 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY32 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY33 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY34 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY35 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY36 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY37 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY40 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY41 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY42 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY43 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY44 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY45 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY46 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY47 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY50 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY51 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY52 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY53 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY54 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY55 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY56 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY57 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY60 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY61 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY62 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY63 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY64 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY65 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY66 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY67 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY71 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY72 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY73 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY74 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY75 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY76 STR 1111111111111111111111111111111111111111111111111111111111111111 +END + Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20081011.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20081011.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20081011.config (revision 31094) @@ -590,3 +590,68 @@ CELL.READNOISE STR ADU END - +# Pattern correction information: +# PATTERN.CELL BOOL FALSE +# we want pattern row correction for all cell for all chips for all data < 2009-12-09 +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction + XY01 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY02 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY03 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY04 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY05 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY06 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY10 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY11 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY12 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY13 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY14 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY15 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY16 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY17 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY20 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY21 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY22 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY23 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY24 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY25 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY26 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY27 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY30 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY31 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY32 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY33 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY34 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY35 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY36 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY37 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY40 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY41 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY42 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY43 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY44 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY45 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY46 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY47 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY50 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY51 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY52 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY53 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY54 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY55 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY56 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY57 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY60 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY61 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY62 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY63 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY64 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY65 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY66 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY67 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY71 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY72 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY73 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY74 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY75 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY76 STR 1111111111111111111111111111111111111111111111111111111111111111 +END Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20090120.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20090120.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20090120.config (revision 31094) @@ -523,2 +523,67 @@ END +# PATTERN.CELL BOOL FALSE +# we want pattern row correction for all cell for all chips for all data < 2009-12-09 +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction + XY01 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY02 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY03 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY04 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY05 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY06 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY10 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY11 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY12 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY13 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY14 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY15 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY16 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY17 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY20 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY21 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY22 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY23 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY24 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY25 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY26 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY27 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY30 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY31 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY32 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY33 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY34 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY35 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY36 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY37 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY40 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY41 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY42 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY43 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY44 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY45 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY46 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY47 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY50 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY51 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY52 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY53 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY54 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY55 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY56 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY57 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY60 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY61 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY62 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY63 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY64 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY65 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY66 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY67 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY71 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY72 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY73 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY74 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY75 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY76 STR 1111111111111111111111111111111111111111111111111111111111111111 +END Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20090220.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20090220.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20090220.config (revision 31094) @@ -522,3 +522,71 @@ CELL.READNOISE STR ADU END - + + +# Pattern correction information: +# PATTERN.CELL BOOL FALSE +# we want pattern row correction for all cell for all chips for all data < 2009-12-09 +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction + XY01 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY02 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY03 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY04 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY05 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY06 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY10 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY11 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY12 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY13 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY14 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY15 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY16 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY17 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY20 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY21 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY22 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY23 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY24 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY25 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY26 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY27 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY30 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY31 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY32 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY33 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY34 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY35 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY36 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY37 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY40 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY41 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY42 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY43 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY44 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY45 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY46 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY47 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY50 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY51 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY52 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY53 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY54 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY55 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY56 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY57 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY60 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY61 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY62 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY63 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY64 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY65 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY66 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY67 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY71 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY72 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY73 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY74 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY75 STR 1111111111111111111111111111111111111111111111111111111111111111 + XY76 STR 1111111111111111111111111111111111111111111111111111111111111111 +END + Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20091209.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20091209.config (revision 31094) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20091209.config (revision 31094) @@ -0,0 +1,652 @@ +# Refurbished GPC1 +# Change effective from 12-09-2009 + +# How to identify this type +RULE METADATA + ORIGIN STR PS1 + TELESCOP STR PS1 + INSTRUME STR gpc1 + CONTROLR STR STARGRASP + NAMPS S32 64 + MJD-OBS F64 55175.00559 # OP: >= +END + +# How to read this data +FILE METADATA + PHU STR CHIP # The FITS file represents a single chip + EXTENSIONS STR CELL # The extensions represent cells + FPA.OBS STR FILENAME # A PHU keyword for unique identifier within the hierarchy level + CONTENT STR DETECTOR # How to determine content of FITS file + CONTENT.RULE STR {CHIP.ID} # How to derive the CONTENT when writing +END + +# What's in the FITS file? +CONTENTS METADATA + # CONTENT = chip name : type + CCID58-2-15a1 STR XY01:GPCChip # chip 00 + CCID58-2-18a1 STR XY02:GPCChip # chip 01 + CCID58-2-04a2 STR XY03:GPCChip # chip 02 + CCID58-1-01b1 STR XY04:GPCChip # chip 03 + CCID58-1-09b1 STR XY05:GPCChip # chip 04 + CCID58-2-09b1 STR XY06:GPCChip # chip 05 + CCID58-2-22a1 STR XY10:GPCChip # chip 06 + CCID58-2-01a1 STR XY11:GPCChip # chip 07 + CCID58-3-11a1 STR XY12:GPCChip # chip 08 + CCID58-3-06a1 STR XY13:GPCChip # chip 09 + CCID58-3-05b1 STR XY14:GPCChip # chip 10 + CCID58-3-08b1 STR XY15:GPCChip # chip 11 + CCID58-1-02b1 STR XY16:GPCChip # chip 12 + CCID58-2-07b2 STR XY17:GPCChip # chip 13 + CCID58-1-19a1 STR XY20:GPCChip # chip 14 + CCID58-1-04a1 STR XY21:GPCChip # chip 15 + CCID58-2-09a2 STR XY22:GPCChip # chip 16 + CCID58-1-02a1 STR XY23:GPCChip # chip 17 + CCID58-3-10b1 STR XY24:GPCChip # chip 18 + CCID58-3-05b2 STR XY25:GPCChip # chip 19 + CCID58-3-04b1 STR XY26:GPCChip # chip 20 + CCID58-1-18b1 STR XY27:GPCChip # chip 21 + CCID58-3-13a2 STR XY30:GPCChip # chip 22 + CCID58-3-05a1 STR XY31:GPCChip # chip 23 + CCID58-2-01a2 STR XY32:GPCChip # chip 24 + CCID58-1-02a2 STR XY33:GPCChip # chip 25 + CCID58-3-03b1 STR XY34:GPCChip # chip 26 + CCID58-1-01b2 STR XY35:GPCChip # chip 27 + CCID58-3-14b1 STR XY36:GPCChip # chip 28 + CCID58-2-23b2 STR XY37:GPCChip # chip 29 + CCID58-3-02b1 STR XY40:GPCChip # chip 30 + CCID58-1-03b2 STR XY41:GPCChip # chip 31 + CCID58-1-07b1 STR XY42:GPCChip # chip 32 + CCID58-2-11b2 STR XY43:GPCChip # chip 33 + CCID58-2-09a1 STR XY44:GPCChip # chip 34 + CCID58-3-04a2 STR XY45:GPCChip # chip 35 + CCID58-3-02a1 STR XY46:GPCChip # chip 36 + CCID58-3-14a1 STR XY47:GPCChip # chip 37 + CCID58-1-17b1 STR XY50:GPCChip # chip 38 + CCID58-2-09b2 STR XY51:GPCChip # chip 39 + CCID58-1-04b1 STR XY52:GPCChip # chip 40 + CCID58-1-05b2 STR XY53:GPCChip # chip 41 + CCID58-3-05a2 STR XY54:GPCChip # chip 42 + CCID58-3-03a2 STR XY55:GPCChip # chip 43 + CCID58-3-02a2 STR XY56:GPCChip # chip 44 + CCID58-3-11a2 STR XY57:GPCChip # chip 45 + CCID58-2-16b1 STR XY60:GPCChip # chip 46 + CCID58-1-03b1 STR XY61:GPCChip # chip 47 + CCID58-3-03b2 STR XY62:GPCChip # chip 48 + CCID58-1-02b2 STR XY63:GPCChip # chip 49 + CCID58-1-07a1 STR XY64:GPCChip # chip 50 + CCID58-2-04a1 STR XY65:GPCChip # chip 51 + CCID58-3-10a1 STR XY66:GPCChip # chip 52 + CCID58-1-09a1 STR XY67:GPCChip # chip 53 + CCID58-2-13b1 STR XY71:GPCChip # chip 54 + CCID58-1-14b1 STR XY72:GPCChip # chip 55 + CCID58-3-11b2 STR XY73:GPCChip # chip 56 + CCID58-1-05a2 STR XY74:GPCChip # chip 57 + CCID58-1-21a1 STR XY75:GPCChip # chip 58 + CCID58-2-05a1 STR XY76:GPCChip # chip 59 +END + +CHIPS METADATA + GPCChip METADATA + # Extension name, cellName:cellType + xy00 STR xy00:GPCCell + xy10 STR xy10:GPCCell + xy20 STR xy20:GPCCell + xy30 STR xy30:GPCCell + xy40 STR xy40:GPCCell + xy50 STR xy50:GPCCell + xy60 STR xy60:GPCCell + xy70 STR xy70:GPCCell + xy01 STR xy01:GPCCell + xy11 STR xy11:GPCCell + xy21 STR xy21:GPCCell + xy31 STR xy31:GPCCell + xy41 STR xy41:GPCCell + xy51 STR xy51:GPCCell + xy61 STR xy61:GPCCell + xy71 STR xy71:GPCCell + xy02 STR xy02:GPCCell + xy12 STR xy12:GPCCell + xy22 STR xy22:GPCCell + xy32 STR xy32:GPCCell + xy42 STR xy42:GPCCell + xy52 STR xy52:GPCCell + xy62 STR xy62:GPCCell + xy72 STR xy72:GPCCell + xy03 STR xy03:GPCCell + xy13 STR xy13:GPCCell + xy23 STR xy23:GPCCell + xy33 STR xy33:GPCCell + xy43 STR xy43:GPCCell + xy53 STR xy53:GPCCell + xy63 STR xy63:GPCCell + xy73 STR xy73:GPCCell + xy04 STR xy04:GPCCell + xy14 STR xy14:GPCCell + xy24 STR xy24:GPCCell + xy34 STR xy34:GPCCell + xy44 STR xy44:GPCCell + xy54 STR xy54:GPCCell + xy64 STR xy64:GPCCell + xy74 STR xy74:GPCCell + xy05 STR xy05:GPCCell + xy15 STR xy15:GPCCell + xy25 STR xy25:GPCCell + xy35 STR xy35:GPCCell + xy45 STR xy45:GPCCell + xy55 STR xy55:GPCCell + xy65 STR xy65:GPCCell + xy75 STR xy75:GPCCell + xy06 STR xy06:GPCCell + xy16 STR xy16:GPCCell + xy26 STR xy26:GPCCell + xy36 STR xy36:GPCCell + xy46 STR xy46:GPCCell + xy56 STR xy56:GPCCell + xy66 STR xy66:GPCCell + xy76 STR xy76:GPCCell + xy07 STR xy07:GPCCell + xy17 STR xy17:GPCCell + xy27 STR xy27:GPCCell + xy37 STR xy37:GPCCell + xy47 STR xy47:GPCCell + xy57 STR xy57:GPCCell + xy67 STR xy67:GPCCell + xy77 STR xy77:GPCCell + END +END + +# Specify the cell data +CELLS METADATA + GPCCell METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC STR DATASEC + CELL.BIASSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + END +END + + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.FILTERID STR FILTERID + FPA.FILTER STR FILTERID + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR EQUINOX + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.OBS.MODE STR OBS_MODE + FPA.COMMENT STR CMMTOBS + FPA.AIRMASS STR AIRMASS + FPA.POSANGLE STR POSANGLE + FPA.ROTANGLE STR ROT + FPA.FOCUS STR M2Z + FPA.TIME STR SHUTOUTC + FPA.ALT STR ALT + FPA.AZ STR AZ + # FPA.TEMP STR DETTEM + FPA.M1X STR M1X + FPA.M1Y STR M1Y + FPA.M1Z STR M1Z + FPA.M1TIP STR M1TIP + FPA.M1TILT STR M1TILT + FPA.M2X STR M2X + FPA.M2Y STR M2Y + FPA.M2Z STR M2Z + FPA.M2TIP STR M2TIP + FPA.M2TILT STR M2TILT + FPA.ENV.TEMP STR ENVTEM + FPA.ENV.HUMID STR ENVHUM + FPA.ENV.WIND STR ENVWIN + FPA.ENV.DIR STR ENVDIR + + FPA.TELTEMP.M1 STR TELTEMM1 # Primary mirror temps (C) + FPA.TELTEMP.M1CELL STR TELTEMMS # Primary mirror support temps (C) + FPA.TELTEMP.M2 STR TELTEMM2 # Secondary mirror temps (C + FPA.TELTEMP.SPIDER STR TELTEMSP # Spider temperatures (C) + FPA.TELTEMP.TRUSS STR TELTEMTR # Mid truss temperatures (C + FPA.TELTEMP.EXTRA STR TELTEMEX # Miscellaneous temperatures (C) + + FPA.BURNTOOL.APPLIED STR BTOOLAPP + CHIP.VIDEOCELL STR CELLMODE + + FPA.PON.TIME STR PONTIME + + CHIP.ID STR DETECTOR + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM + CELL.X0 STR IMNPIX1 + CELL.Y0 STR IMNPIX2 + CELL.XPARITY STR ATM1_1 + CELL.YPARITY STR ATM2_2 + CHIP.TEMP STR DETTEM + FPA.EXPOSURE STR EXPREQ # Requested exposure time, presumably camera exposure time + CELL.EXPOSURE STR EXPTIME # Exposure time measured by shutter + CELL.DARKTIME STR DARKTIME # Exposure time for camera + CELL.TIME STR SHUTOUTC # Observation time + CELL.GAIN STR GAIN # Cell gain (e/ADU) + CELL.READNOISE STR RDNOISE # Cell read noise (ADU) + CELL.SATURATION STR MAXLIN # Saturation point (ADU) +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR PS1 + FPA.INSTRUMENT STR GPC1 + FPA.LONGITUDE STR 10:25:01.417 # West Longitude in Hours 10.4170608521 + FPA.LATITUDE STR 20:42:25.558 # North Latitude in Degrees 20.7070999146 + FPA.ELEVATION F32 3048.0 # altitude in meters + FPA.DETECTOR STR GPC1 + FPA.TIMESYS STR UTC + CHIP.XSIZE S32 4846 + CHIP.YSIZE S32 4868 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + XY01 S32 4971 + XY02 S32 4971 + XY03 S32 4971 + XY04 S32 4971 + XY05 S32 4971 + XY06 S32 4971 + XY10 S32 9942 + XY11 S32 9942 + XY12 S32 9942 + XY13 S32 9942 + XY14 S32 9942 + XY15 S32 9942 + XY16 S32 9942 + XY17 S32 9942 + XY20 S32 14913 + XY21 S32 14913 + XY22 S32 14913 + XY23 S32 14913 + XY24 S32 14913 + XY25 S32 14913 + XY26 S32 14913 + XY27 S32 14913 + XY30 S32 19884 + XY31 S32 19884 + XY32 S32 19884 + XY33 S32 19884 # should be 19872 + XY34 S32 19884 + XY35 S32 19884 + XY36 S32 19884 + XY37 S32 19884 + XY40 S32 20041 + XY41 S32 20041 + XY42 S32 20041 + XY43 S32 20041 # should be 20029 + XY44 S32 20041 + XY45 S32 20041 + XY46 S32 20041 + XY47 S32 20041 + XY50 S32 25012 + XY51 S32 25012 + XY52 S32 25012 + XY53 S32 25012 + XY54 S32 25012 + XY55 S32 25012 + XY56 S32 25012 + XY57 S32 25012 + XY60 S32 29983 + XY61 S32 29983 + XY62 S32 29983 + XY63 S32 29983 + XY64 S32 29983 + XY65 S32 29983 + XY66 S32 29983 + XY67 S32 29983 + XY71 S32 34954 + XY72 S32 34954 + XY73 S32 34954 + XY74 S32 34954 + XY75 S32 34954 + XY76 S32 34954 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + XY01 S32 10286 + XY02 S32 15429 + XY03 S32 20572 + XY04 S32 25715 + XY05 S32 30858 + XY06 S32 36001 + XY10 S32 5143 + XY11 S32 10286 + XY12 S32 15429 + XY13 S32 20572 + XY14 S32 25715 + XY15 S32 30858 + XY16 S32 36001 + XY17 S32 41144 + XY20 S32 5143 + XY21 S32 10286 + XY22 S32 15429 + XY23 S32 20572 + XY24 S32 25715 + XY25 S32 30858 + XY26 S32 36001 + XY27 S32 41144 + XY30 S32 5143 + XY31 S32 10286 + XY32 S32 15429 + XY33 S32 20572 + XY34 S32 25715 # should be 25755 + XY35 S32 30858 + XY36 S32 36001 + XY37 S32 41144 + XY40 S32 306 + XY41 S32 5449 + XY42 S32 10592 + XY43 S32 15735 # should be 15707 + XY44 S32 20878 # should be 20890 + XY45 S32 26021 + XY46 S32 31164 + XY47 S32 36307 + XY50 S32 306 + XY51 S32 5449 + XY52 S32 10592 + XY53 S32 15735 + XY54 S32 20878 + XY55 S32 26021 + XY56 S32 31164 + XY57 S32 36307 + XY60 S32 306 + XY61 S32 5449 + XY62 S32 10592 + XY63 S32 15735 + XY64 S32 20878 + XY65 S32 26021 + XY66 S32 31164 + XY67 S32 36307 + XY71 S32 5449 + XY72 S32 10592 + XY73 S32 15735 + XY74 S32 20878 + XY75 S32 26021 + XY76 S32 31164 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + END + CELL.READDIR S32 1 + CELL.BAD S32 0 + CELL.XSIZE S32 590 + CELL.YSIZE S32 598 + CELL.TIMESYS STR UTC +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + # this rule is fragile : does not match the camera + FPA.TEMP STR SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2 +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR DEGREES + FPA.DEC STR DEGREES + FPA.LONGITUDE STR HOURS + FPA.LATITUDE STR DEGREES + FPA.TIME STR YEAR.FIRST + CELL.TIME STR YEAR.FIRST + CELL.BINNING STR TOGETHER + # CELL.X0 STR FORTRAN + # CELL.Y0 STR FORTRAN + CELL.READNOISE STR ADU +END + + +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction + XY01 BOOL FALSE + XY02 BOOL FALSE + XY03 BOOL FALSE + XY04 BOOL FALSE + XY05 BOOL FALSE + XY06 BOOL FALSE + XY10 BOOL FALSE + XY11 BOOL FALSE + XY12 BOOL FALSE + XY13 BOOL FALSE + XY14 BOOL FALSE + XY15 STR 1111111100000000000000000000000000000000000000000000000000000000 # cols: 0 + XY16 BOOL FALSE + XY17 BOOL FALSE + XY20 BOOL FALSE + XY21 BOOL FALSE + XY22 BOOL FALSE + XY23 BOOL FALSE + XY24 BOOL FALSE + XY25 BOOL FALSE + XY26 BOOL FALSE + XY27 STR 1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7 + XY30 BOOL FALSE + XY31 BOOL FALSE + XY32 STR 0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7 + XY33 BOOL FALSE + XY34 BOOL FALSE + XY35 BOOL FALSE + XY36 BOOL FALSE + XY37 BOOL FALSE + XY40 BOOL FALSE + XY41 BOOL FALSE + XY42 BOOL FALSE + XY43 BOOL FALSE + XY44 BOOL FALSE + XY45 STR 0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7 + XY46 BOOL FALSE + XY47 STR 1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7 + XY50 BOOL FALSE + XY51 BOOL FALSE + XY52 BOOL FALSE + XY53 BOOL FALSE + XY54 BOOL FALSE + XY55 BOOL FALSE + XY56 BOOL FALSE + XY57 STR 1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7 + XY60 STR 0000000000000000000000000000000000000000000001000000000000000000 # cell xy55 + XY61 BOOL FALSE + XY62 BOOL FALSE + XY63 BOOL FALSE + XY64 BOOL FALSE + XY65 BOOL FALSE + XY66 BOOL FALSE + XY67 BOOL FALSE + XY71 BOOL FALSE + XY72 BOOL FALSE + XY73 BOOL FALSE + XY74 STR 0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7 + XY75 BOOL FALSE + XY76 BOOL FALSE +END + +# PATTERN.CELL BOOL TRUE # by default, do not do any cell pattern correction +PATTERN.CELL.SUBSET METADATA # List of chips and whether to do cell pattern correction + XY01 BOOL FALSE + XY02 BOOL FALSE + XY03 BOOL FALSE + XY04 BOOL FALSE + XY05 BOOL FALSE + XY06 STR 11010000000100000001101001000000000000000000000000000000000000000 + XY10 BOOL FALSE + XY11 BOOL FALSE + XY12 BOOL FALSE + XY13 BOOL FALSE + XY14 STR 0000000000000000000000000000000000000000000000010000000000101101 + XY15 STR 0011111100011000000001000000010000001001000111110001010000011111 + XY16 STR 0000000100000000000000000000000000000001000000000000000000000000 + XY17 BOOL FALSE + XY20 BOOL FALSE + XY21 BOOL FALSE + XY22 BOOL FALSE + XY23 BOOL FALSE + XY24 STR 0000000000100000000000000110100000100000001000000011100000000000 + XY25 STR 0100010000001001001011000000001000000111000110000000100000000010 + XY26 STR 0000000000000100000000000000000000001000001000000000000000000000 + XY27 BOOL FALSE + XY30 BOOL FALSE + XY31 BOOL FALSE + XY32 BOOL FALSE + XY33 BOOL FALSE + XY34 STR 0000000000000000000000000000000000000001000011000000101000111111 + XY35 BOOL FALSE + XY36 STR 0000000000000000000000000000000000010000000000000000000000000000 + XY37 STR 0000000000000000000000000000000100010001000000001011000010110110 + XY40 STR 0000000000000000000000000010110000000000000001110000001000011111 + XY41 BOOL FALSE + XY42 BOOL FALSE + XY43 STR 0000000000000000000000010000000100000000000010000100000100000100 + XY44 BOOL FALSE + XY45 BOOL FALSE + XY46 BOOL FALSE + XY47 BOOL FALSE + XY50 BOOL FALSE + XY51 BOOL FALSE + XY52 BOOL FALSE + XY53 BOOL FALSE + XY54 BOOL FALSE + XY55 BOOL FALSE + XY56 BOOL FALSE + XY57 BOOL FALSE + XY60 BOOL FALSE + XY61 BOOL FALSE + XY62 STR 0000000000000000000000000000000000001000000000000000000100001010 + XY63 BOOL FALSE + XY64 BOOL FALSE + XY65 BOOL FALSE + XY66 BOOL FALSE + XY67 BOOL FALSE + XY71 BOOL FALSE + XY72 STR 0000000000000000000000000000000000000000000000000000000000000001 + XY73 STR 0001100000000000000000000000001000000000000000000000000000000000 + XY74 BOOL FALSE + XY75 BOOL FALSE + XY76 BOOL FALSE +END Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20100122.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20100122.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20100122.config (revision 31094) @@ -524,2 +524,130 @@ END + +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction + XY01 BOOL FALSE + XY02 BOOL FALSE + XY03 BOOL FALSE + XY04 BOOL FALSE + XY05 BOOL FALSE + XY06 BOOL FALSE + XY10 BOOL FALSE + XY11 BOOL FALSE + XY12 BOOL FALSE + XY13 BOOL FALSE + XY14 BOOL FALSE + XY15 STR 1111111100000000000000000000000000000000000000000000000000000000 # cols: 0 + XY16 BOOL FALSE + XY17 BOOL FALSE + XY20 BOOL FALSE + XY21 BOOL FALSE + XY22 BOOL FALSE + XY23 BOOL FALSE + XY24 BOOL FALSE + XY25 BOOL FALSE + XY26 BOOL FALSE + XY27 STR 1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7 + XY30 BOOL FALSE + XY31 BOOL FALSE + XY32 STR 0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7 + XY33 BOOL FALSE + XY34 BOOL FALSE + XY35 BOOL FALSE + XY36 BOOL FALSE + XY37 BOOL FALSE + XY40 BOOL FALSE + XY41 BOOL FALSE + XY42 BOOL FALSE + XY43 BOOL FALSE + XY44 BOOL FALSE + XY45 STR 0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7 + XY46 BOOL FALSE + XY47 STR 1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7 + XY50 BOOL FALSE + XY51 BOOL FALSE + XY52 BOOL FALSE + XY53 BOOL FALSE + XY54 BOOL FALSE + XY55 BOOL FALSE + XY56 BOOL FALSE + XY57 STR 1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7 + XY60 STR 0000000000000000000000000000000000000000000001000000000000000000 # cell xy55 + XY61 BOOL FALSE + XY62 BOOL FALSE + XY63 BOOL FALSE + XY64 BOOL FALSE + XY65 BOOL FALSE + XY66 BOOL FALSE + XY67 BOOL FALSE + XY71 BOOL FALSE + XY72 BOOL FALSE + XY73 BOOL FALSE + XY74 STR 0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7 + XY75 BOOL FALSE + XY76 BOOL FALSE +END + +# PATTERN.CELL BOOL TRUE # by default, do not do any cell pattern correction +PATTERN.CELL.SUBSET METADATA # List of chips and whether to do cell pattern correction + XY01 BOOL FALSE + XY02 BOOL FALSE + XY03 BOOL FALSE + XY04 BOOL FALSE + XY05 BOOL FALSE + XY06 STR 11010000000100000001101001000000000000000000000000000000000000000 + XY10 BOOL FALSE + XY11 BOOL FALSE + XY12 BOOL FALSE + XY13 BOOL FALSE + XY14 STR 0000000000000000000000000000000000000000000000010000000000101101 + XY15 STR 0011111100011000000001000000010000001001000111110001010000011111 + XY16 STR 0000000100000000000000000000000000000001000000000000000000000000 + XY17 BOOL FALSE + XY20 BOOL FALSE + XY21 BOOL FALSE + XY22 BOOL FALSE + XY23 BOOL FALSE + XY24 STR 0000000000100000000000000110100000100000001000000011100000000000 + XY25 STR 0100010000001001001011000000001000000111000110000000100000000010 + XY26 STR 0000000000000100000000000000000000001000001000000000000000000000 + XY27 BOOL FALSE + XY30 BOOL FALSE + XY31 BOOL FALSE + XY32 BOOL FALSE + XY33 BOOL FALSE + XY34 STR 0000000000000000000000000000000000000001000011000000101000111111 + XY35 BOOL FALSE + XY36 STR 0000000000000000000000000000000000010000000000000000000000000000 + XY37 STR 0000000000000000000000000000000100010001000000001011000010110110 + XY40 STR 0000000000000000000000000010110000000000000001110000001000011111 + XY41 BOOL FALSE + XY42 BOOL FALSE + XY43 STR 0000000000000000000000010000000100000000000010000100000100000100 + XY44 BOOL FALSE + XY45 BOOL FALSE + XY46 BOOL FALSE + XY47 BOOL FALSE + XY50 BOOL FALSE + XY51 BOOL FALSE + XY52 BOOL FALSE + XY53 BOOL FALSE + XY54 BOOL FALSE + XY55 BOOL FALSE + XY56 BOOL FALSE + XY57 BOOL FALSE + XY60 BOOL FALSE + XY61 BOOL FALSE + XY62 STR 0000000000000000000000000000000000001000000000000000000100001010 + XY63 BOOL FALSE + XY64 BOOL FALSE + XY65 BOOL FALSE + XY66 BOOL FALSE + XY67 BOOL FALSE + XY71 BOOL FALSE + XY72 STR 0000000000000000000000000000000000000000000000000000000000000001 + XY73 STR 0001100000000000000000000000001000000000000000000000000000000000 + XY74 BOOL FALSE + XY75 BOOL FALSE + XY76 BOOL FALSE +END Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20100228.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20100228.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20100228.config (revision 31094) @@ -526,5 +526,5 @@ # Pattern correction information: -PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction XY01 BOOL FALSE @@ -535,5 +535,5 @@ XY06 BOOL FALSE XY10 BOOL FALSE - XY11 BOOL 0011100100000000000000000000000000000000000000000000000000000000 + XY11 STR 0011100100000000000000000000000000000000000000000000000000000000 XY12 BOOL FALSE XY13 BOOL FALSE @@ -590,5 +590,5 @@ END -PATTERN.CELL BOOL TRUE # by default, do not do any cell pattern correction +# PATTERN.CELL BOOL TRUE # by default, do not do any cell pattern correction PATTERN.CELL.SUBSET METADATA # List of chips and whether to do cell pattern correction XY01 BOOL FALSE Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20100723.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20100723.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/format_20100723.config (revision 31094) @@ -526,5 +526,5 @@ # Pattern correction information: -PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction XY01 BOOL FALSE @@ -535,5 +535,5 @@ XY06 BOOL FALSE XY10 BOOL FALSE - XY11 BOOL 0011100100000000000000000000000000000000000000000000000000000000 + XY11 STR 0011100100000000000000000000000000000000000000000000000000000000 XY12 BOOL FALSE XY13 BOOL FALSE @@ -590,5 +590,5 @@ END -PATTERN.CELL BOOL TRUE # by default, do not do any cell pattern correction +# PATTERN.CELL BOOL TRUE # by default, do not do any cell pattern correction PATTERN.CELL.SUBSET METADATA # List of chips and whether to do cell pattern correction XY01 BOOL FALSE Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppImage.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppImage.config (revision 31094) @@ -25,131 +25,7 @@ NOISEMAP BOOL FALSE # Apply read noise map -PATTERN.ROW BOOL FALSE # Do any row pattern correction at all? -PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction - XY01 BOOL FALSE - XY02 BOOL FALSE - XY03 BOOL FALSE - XY04 BOOL FALSE - XY05 BOOL FALSE - XY06 BOOL FALSE - XY10 BOOL FALSE - XY11 BOOL FALSE - XY12 BOOL FALSE - XY13 BOOL FALSE - XY14 BOOL FALSE - XY15 STR 1111111100000000000000000000000000000000000000000000000000000000 # cols: 0 - XY16 BOOL FALSE - XY17 BOOL FALSE - XY20 BOOL FALSE - XY21 BOOL FALSE - XY22 BOOL FALSE - XY23 BOOL FALSE - XY24 BOOL FALSE - XY25 BOOL FALSE - XY26 BOOL FALSE - XY27 STR 1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7 - XY30 BOOL FALSE - XY31 BOOL FALSE - XY32 STR 0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7 - XY33 BOOL FALSE - XY34 BOOL FALSE - XY35 BOOL FALSE - XY36 BOOL FALSE - XY37 BOOL FALSE - XY40 BOOL FALSE - XY41 BOOL FALSE - XY42 BOOL FALSE - XY43 BOOL FALSE - XY44 BOOL FALSE - XY45 STR 0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7 - XY46 BOOL FALSE - XY47 STR 1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7 - XY50 BOOL FALSE - XY51 BOOL FALSE - XY52 BOOL FALSE - XY53 BOOL FALSE - XY54 BOOL FALSE - XY55 BOOL FALSE - XY56 BOOL FALSE - XY57 STR 1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7 - XY60 STR 0000000000000000000000000000000000000000000001000000000000000000 # cell xy55 - XY61 BOOL FALSE - XY62 BOOL FALSE - XY63 BOOL FALSE - XY64 BOOL FALSE - XY65 BOOL FALSE - XY66 BOOL FALSE - XY67 BOOL FALSE - XY71 BOOL FALSE - XY72 BOOL FALSE - XY73 BOOL FALSE - XY74 STR 0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7 - XY75 BOOL FALSE - XY76 BOOL FALSE -END - -PATTERN.CELL BOOL FALSE # by default, do not do any cell pattern correction -PATTERN.CELL.SUBSET METADATA # List of chips and whether to do cell pattern correction - XY01 BOOL FALSE - XY02 BOOL FALSE - XY03 BOOL FALSE - XY04 BOOL FALSE - XY05 BOOL FALSE - XY06 STR 11010000000100000001101001000000000000000000000000000000000000000 - XY10 BOOL FALSE - XY11 BOOL FALSE - XY12 BOOL FALSE - XY13 BOOL FALSE - XY14 STR 0000000000000000000000000000000000000000000000010000000000101101 - XY15 STR 0011111100011000000001000000010000001001000111110001010000011111 - XY16 STR 0000000100000000000000000000000000000001000000000000000000000000 - XY17 BOOL FALSE - XY20 BOOL FALSE - XY21 BOOL FALSE - XY22 BOOL FALSE - XY23 BOOL FALSE - XY24 STR 0000000000100000000000000110100000100000001000000011100000000000 - XY25 STR 0100010000001001001011000000001000000111000110000000100000000010 - XY26 STR 0000000000000100000000000000000000001000001000000000000000000000 - XY27 BOOL FALSE - XY30 BOOL FALSE - XY31 BOOL FALSE - XY32 BOOL FALSE - XY33 BOOL FALSE - XY34 STR 0000000000000000000000000000000000000001000011000000101000111111 - XY35 BOOL FALSE - XY36 STR 0000000000000000000000000000000000010000000000000000000000000000 - XY37 STR 0000000000000000000000000000000100010001000000001011000010110110 - XY40 STR 0000000000000000000000000010110000000000000001110000001000011111 - XY41 BOOL FALSE - XY42 BOOL FALSE - XY43 STR 0000000000000000000000010000000100000000000010000100000100000100 - XY44 BOOL FALSE - XY45 BOOL FALSE - XY46 BOOL FALSE - XY47 BOOL FALSE - XY50 BOOL FALSE - XY51 BOOL FALSE - XY52 BOOL FALSE - XY53 BOOL FALSE - XY54 BOOL FALSE - XY55 BOOL FALSE - XY56 BOOL FALSE - XY57 BOOL FALSE - XY60 BOOL FALSE - XY61 BOOL FALSE - XY62 STR 0000000000000000000000000000000000001000000000000000000100001010 - XY63 BOOL FALSE - XY64 BOOL FALSE - XY65 BOOL FALSE - XY66 BOOL FALSE - XY67 BOOL FALSE - XY71 BOOL FALSE - XY72 STR 0000000000000000000000000000000000000000000000000000000000000001 - XY73 STR 0001100000000000000000000000001000000000000000000000000000000000 - XY74 BOOL FALSE - XY75 BOOL FALSE - XY76 BOOL FALSE -END + + + TILTYSTREAK.BY.CLASS METADATA # apply the 'tiltystreak' tool @@ -272,33 +148,80 @@ # Standard chip processing -CHIP METADATA - BASE.FITS BOOL FALSE # Save base detrended image? - BASE.MASK.FITS BOOL FALSE # Save base detrended image? - BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? - CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? - CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? - CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? - OVERSCAN BOOL TRUE # Overscan subtraction - NONLIN BOOL FALSE # apply non-linearity correction - BIAS BOOL FALSE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - REMNANCE BOOL FALSE # Remnance masking - SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL TRUE # Flat-field normalisation - MASK BOOL TRUE # Mask bad pixels - MASK.BUILD BOOL TRUE # Build internal mask? - MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails - PATTERN.ROW BOOL TRUE # Row pattern correction - PATTERN.CELL BOOL TRUE # Cell pattern correction - FRINGE BOOL TRUE # Fringe subtraction - BIN1.FITS BOOL TRUE # Save 1st binned chip image? - BIN2.FITS BOOL TRUE # Save 2nd binned chip image? - PHOTOM BOOL TRUE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? - ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? - BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? -END - +CHIP METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails + PATTERN.ROW BOOL TRUE # Row pattern correction + PATTERN.CELL BOOL TRUE # Cell pattern correction + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? + CROSSTALK.MEASURE BOOL TRUE # Subtract model background? +END + +CHIP_MASKTEST METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails + PATTERN.ROW BOOL TRUE # Row pattern correction + PATTERN.CELL BOOL TRUE # Cell pattern correction + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? + CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + + DETREND.CONSTRAINTS METADATA + DARK METADATA + DETTYPE STR DARKTEST + EXPTIME STR FPA.EXPOSURE + END + MASK METADATA + DETTYPE STR MASKTEST + END + FLAT METADATA + FILTER STR FPA.FILTERID + END + FLATCORR METADATA + FILTER STR FPA.FILTERID + END + FRINGE METADATA + FILTER STR FPA.FILTERID + END +END + # Standard chip processing CHIP_ADDNOISE METADATA @@ -428,5 +351,5 @@ CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction - NONLIN BOOL TRUE # apply non-linearity correction + NONLIN BOOL TRUE # apply non-linearity correction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppStack.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppStack.config (revision 31094) @@ -19,6 +19,7 @@ PS1_REFERENCE METADATA - OUTPUT.NOCOMP BOOL TRUE - OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE END Index: /branches/eam_branches/ipp-20110213/ippconfig/gpc1/psastro.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/gpc1/psastro.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/gpc1/psastro.config (revision 31094) @@ -165,6 +165,10 @@ REFSTAR_MASK_SATSTAR_MAG_MAX F32 -15.0 REFSTAR_MASK_SATSTAR_MAG_SLOPE F32 10.15 +# CZW: Original 2010-02-08 position angle offset REFSTAR_MASK_SATSTAR_POS_ZERO F32 -0.798 - +# CZW: Updated 2011-02-18 position angle offset. As above, offset 0.5 degree. +# REFSTAR_MASK_SATSTAR_POS_ZERO F32 -0.78927 +#REFSTAR_MASK_SATSTAR_POS_ZERO F32 -0.80237 +#REFSTAR_MASK_SATSTAR_POS_ZERO F32 -0.81109 # Length = 10**(SLOPE*(MAG_MAX - InstMag)) - OFFSET @@ -172,4 +176,8 @@ REFSTAR_MASK_SATSPIKE_MAG_MAX F32 7.35 REFSTAR_MASK_SATSPIKE_OFFSET F32 200.0 +REFSTAR_MASK_SATSPIKE_WIDTH F32 8.00 +# Width control. if L > L0, W = W0 + (L - L0) * slope +REFSTAR_MASK_SATSPIKE_L0 F32 200.0 +REFSTAR_MASK_SATSPIKE_WIDTH_SLOPE F32 0.01 # pair 1 (longer) @@ -179,5 +187,6 @@ # REFSTAR_MASK_SATSPIKE_MAG_MAX2 F32 -17.70 -REFSTAR_MASK_SATSPIKE_WIDTH F32 8.00 + + REFSTAR_MASK_BLEED BOOL FALSE Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/dqStatsTool.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/dqStatsTool.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/dqStatsTool.config (revision 31094) @@ -10,33 +10,35 @@ RULETYPE STR STRICT END +# CZW: 2011-02-09 All deteff values in the database currently report values 1.85 mag less sensitive than reality. # CDF data generated from the data in camRun with non-NULL deteff values. # CZW: How I did this so I can remember next time. # echo "select zpt_obs,fwhm_major,deteff from camProcessedExp JOIN camRun USING (cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) WHERE camRun.label LIKE '%.nightlyscience' AND quality = 0 AND filter = 'FILTER';" | sed 's/FILTER/g.00000/' | mysql -h ippdb01 -u ipp -pipp gpc1 | awk '{print($3)}' | grep -v deteff | grep -v NULL | mk_cdf.pl | awk '{print($2,$1)}' | spline - `echo 0.0 0.05 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 0.99 1.0` +# CZW: 2011-03-10 We've been off the sky too much to get much new science data. I've added the ThreePi.136 reprocessing to this to help gri RULE METADATA COLNAME STR DETEFF RULETYPE STR CDF FILTER STR g.00000 - CDF00 F32 13.0214 - CDF05 F32 18.4582 - CDF10 F32 18.8631 - CDF15 F32 19.1020 - CDF20 F32 19.3304 - CDF25 F32 19.4613 - CDF30 F32 19.5324 - CDF35 F32 19.6094 - CDF40 F32 19.6878 - CDF45 F32 19.7477 - CDF50 F32 19.8058 - CDF55 F32 19.8737 - CDF60 F32 19.9409 - CDF65 F32 20.0108 - CDF70 F32 20.0860 - CDF75 F32 20.1694 - CDF80 F32 20.2681 - CDF85 F32 20.3974 - CDF90 F32 20.5609 - CDF95 F32 20.7193 - CDF99 F32 20.9785 - CDF100 F32 21.6135 + CDF00 F32 20.199000 + CDF05 F32 21.471400 + CDF10 F32 21.725000 + CDF15 F32 21.857800 + CDF20 F32 21.918700 + CDF25 F32 21.976500 + CDF30 F32 22.020800 + CDF35 F32 22.062900 + CDF40 F32 22.104200 + CDF45 F32 22.136400 + CDF50 F32 22.173500 + CDF55 F32 22.210900 + CDF60 F32 22.243500 + CDF65 F32 22.280600 + CDF70 F32 22.317500 + CDF75 F32 22.360300 + CDF80 F32 22.405100 + CDF85 F32 22.453400 + CDF90 F32 22.508500 + CDF95 F32 22.575100 + CDF99 F32 22.715100 + CDF100 F32 22.992000 END RULE METADATA @@ -44,26 +46,26 @@ RULETYPE STR CDF FILTER STR r.00000 - CDF00 F32 13.0000 - CDF05 F32 17.9079 - CDF10 F32 18.4030 - CDF15 F32 18.7973 - CDF20 F32 19.0507 - CDF25 F32 19.2644 - CDF30 F32 19.4433 - CDF35 F32 19.5680 - CDF40 F32 19.6728 - CDF45 F32 19.7609 - CDF50 F32 19.8393 - CDF55 F32 19.9125 - CDF60 F32 19.9751 - CDF65 F32 20.0395 - CDF70 F32 20.0926 - CDF75 F32 20.1673 - CDF80 F32 20.2457 - CDF85 F32 20.3496 - CDF90 F32 20.4967 - CDF95 F32 20.7552 - CDF99 F32 21.2945 - CDF100 F32 21.6046 + CDF00 F32 16.424200 + CDF05 F32 20.942300 + CDF10 F32 21.219600 + CDF15 F32 21.432500 + CDF20 F32 21.605300 + CDF25 F32 21.731400 + CDF30 F32 21.803200 + CDF35 F32 21.890000 + CDF40 F32 21.954700 + CDF45 F32 22.006200 + CDF50 F32 22.052200 + CDF55 F32 22.098400 + CDF60 F32 22.132500 + CDF65 F32 22.163900 + CDF70 F32 22.198400 + CDF75 F32 22.229200 + CDF80 F32 22.267200 + CDF85 F32 22.307500 + CDF90 F32 22.356100 + CDF95 F32 22.419900 + CDF99 F32 22.555900 + CDF100 F32 22.870400 END RULE METADATA @@ -71,53 +73,54 @@ RULETYPE STR CDF FILTER STR i.00000 - CDF00 F32 16.4751 - CDF05 F32 18.3041 - CDF10 F32 18.5018 - CDF15 F32 18.6497 - CDF20 F32 18.7602 - CDF25 F32 18.8521 - CDF30 F32 18.9267 - CDF35 F32 19.0105 - CDF40 F32 19.0948 - CDF45 F32 19.1563 - CDF50 F32 19.2215 - CDF55 F32 19.296 - CDF60 F32 19.3689 - CDF65 F32 19.4438 - CDF70 F32 19.5261 - CDF75 F32 19.6127 - CDF80 F32 19.7071 - CDF85 F32 19.8518 - CDF90 F32 20.0447 - CDF95 F32 20.5386 - CDF99 F32 21.1344 - CDF100 F32 21.5592 - END + CDF00 F32 15.811400 + CDF05 F32 20.082600 + CDF10 F32 20.829900 + CDF15 F32 21.044500 + CDF20 F32 21.163700 + CDF25 F32 21.256500 + CDF30 F32 21.343700 + CDF35 F32 21.412300 + CDF40 F32 21.474900 + CDF45 F32 21.533000 + CDF50 F32 21.593000 + CDF55 F32 21.658700 + CDF60 F32 21.734000 + CDF65 F32 21.790500 + CDF70 F32 21.861200 + CDF75 F32 21.927400 + CDF80 F32 22.004800 + CDF85 F32 22.103500 + CDF90 F32 22.238100 + CDF95 F32 22.378100 + CDF99 F32 22.489700 + CDF100 F32 22.892300 + END +# Updated with somewhat questionable values due to low numbers of zy data. RULE METADATA COLNAME STR DETEFF RULETYPE STR CDF FILTER STR z.00000 - CDF00 F32 12.1771 - CDF05 F32 17.5262 - CDF10 F32 17.7958 - CDF15 F32 17.9979 - CDF20 F32 18.1753 - CDF25 F32 18.3201 - CDF30 F32 18.4335 - CDF35 F32 18.5478 - CDF40 F32 18.6470 - CDF45 F32 18.7494 - CDF50 F32 18.8370 - CDF55 F32 18.9166 - CDF60 F32 19.0028 - CDF65 F32 19.0912 - CDF70 F32 19.1886 - CDF75 F32 19.2912 - CDF80 F32 19.4137 - CDF85 F32 19.5244 - CDF90 F32 19.6437 - CDF95 F32 19.9135 - CDF99 F32 20.6482 - CDF100 F32 21.0925 + CDF00 F32 14.759100 + CDF05 F32 17.486900 + CDF10 F32 18.923700 + CDF15 F32 19.383900 + CDF20 F32 19.760100 + CDF25 F32 19.950600 + CDF30 F32 20.097300 + CDF35 F32 20.203800 + CDF40 F32 20.286700 + CDF45 F32 20.377800 + CDF50 F32 20.455000 + CDF55 F32 20.527300 + CDF60 F32 20.621800 + CDF65 F32 20.713000 + CDF70 F32 20.787700 + CDF75 F32 20.884300 + CDF80 F32 21.027100 + CDF85 F32 21.183500 + CDF90 F32 21.275500 + CDF95 F32 21.383300 + CDF99 F32 21.577900 + CDF100 F32 21.670700 END RULE METADATA @@ -125,27 +128,28 @@ RULETYPE STR CDF FILTER STR y.00000 - CDF00 F32 11.6109 - CDF05 F32 16.7278 - CDF10 F32 17.0561 - CDF15 F32 17.2778 - CDF20 F32 17.4367 - CDF25 F32 17.5495 - CDF30 F32 17.6469 - CDF35 F32 17.7392 - CDF40 F32 17.8160 - CDF45 F32 17.8927 - CDF50 F32 17.9779 - CDF55 F32 18.0514 - CDF60 F32 18.1292 - CDF65 F32 18.2153 - CDF70 F32 19.2903 - CDF75 F32 18.3627 - CDF80 F32 18.4325 - CDF85 F32 18.5321 - CDF90 F32 18.6403 - CDF95 F32 18.7523 - CDF99 F32 18.8892 - CDF100 F32 19.064 - END + CDF00 F32 14.606500 + CDF05 F32 17.436900 + CDF10 F32 18.090700 + CDF15 F32 18.350700 + CDF20 F32 18.549300 + CDF25 F32 18.727300 + CDF30 F32 18.934300 + CDF35 F32 19.140200 + CDF40 F32 19.294800 + CDF45 F32 19.400400 + CDF50 F32 19.493000 + CDF55 F32 19.564800 + CDF60 F32 19.665600 + CDF65 F32 19.744900 + CDF70 F32 19.821300 + CDF75 F32 19.900400 + CDF80 F32 20.005400 + CDF85 F32 20.087600 + CDF90 F32 20.148200 + CDF95 F32 20.220300 + CDF99 F32 20.365800 + CDF100 F32 20.594900 + END +# Not updated on 2011-03-28 due to insufficient w data. RULE METADATA COLNAME STR DETEFF @@ -235,4 +239,5 @@ TYPE VAL TABLE ENTRY DATATYPE COLNAME COLUMN VAL rawExp exp_name PS_DATA_STRING EXPNAME # Exposure name + COLUMN VAL rawExp camera PS_DATA_STRING CAMERA # The camera for this exposure COLUMN VAL rawExp dateobs PS_DATA_TIME DATEOBS # Date of observation COLUMN VAL rawExp filter PS_DATA_STRING FILTER # Filter used Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/filerules-mef.mdc =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/filerules-mef.mdc (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/filerules-mef.mdc (revision 31094) @@ -254,4 +254,5 @@ SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE +SKYCELL.STATS.UPDATE OUTPUT {OUTPUT}.stats.update STATS NONE FPA TRUE NONE SKYCELL.TEMPLATE OUTPUT {OUTPUT}.skycell SKYCELL NONE FPA TRUE NONE Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/filerules-simple.mdc (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/filerules-simple.mdc (revision 31094) @@ -224,4 +224,5 @@ SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE +SKYCELL.STATS.UPDATE OUTPUT {OUTPUT}.stats.update STATS NONE FPA TRUE NONE SKYCELL.TEMPLATE OUTPUT {OUTPUT}.skycell SKYCELL NONE FPA TRUE NONE Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/filerules-split.mdc =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/filerules-split.mdc (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/filerules-split.mdc (revision 31094) @@ -250,4 +250,5 @@ SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE +SKYCELL.STATS.UPDATE OUTPUT {OUTPUT}.stats.update STATS NONE FPA TRUE NONE SKYCELL.TEMPLATE OUTPUT {OUTPUT}.skycell SKYCELL NONE FPA TRUE NONE Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/nightly_science.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/nightly_science.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/nightly_science.config (revision 31094) @@ -23,5 +23,5 @@ MODE STR MAGICDS COMMAND STR magicdstool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ - RETENTION_TIME S16 1 + RETENTION_TIME S16 2 END CLEAN_MODES METADATA @@ -237,5 +237,5 @@ NAME STR CNP DISTRIBUTION STR CNP - TESS STR RINGS.V0 + TESS STR CNP.V3 OBSMODE STR CNP STACKABLE BOOL FALSE @@ -250,5 +250,5 @@ DIFFABLE BOOL TRUE CHIP S16 10 - DIFF S16 10 + DIFF S16 12 END # This is a hack, and I freely admit it. Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/ppImage.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/ppImage.config (revision 31094) @@ -178,4 +178,42 @@ MASK.STATS BOOL TRUE # Calculate Mask statistics. END + +#standard processing, testing new mask + +CHIP_MASKTEST METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? + + DETREND.CONSTRAINTS METADATA + DARK METADATA + DETTYPE STR DARKTEST + EXPTIME STR FPA.EXPOSURE + END + MASK METADATA + DETTYPE STR MASKTEST + END + END +END + + + # Standard chip processing with tiltystreak options (define by camera) @@ -1972,6 +2010,6 @@ BACKGROUND BOOL TRUE # Subtract background? MASK.STATS BOOL TRUE # Calculate Mask statistics - PATTERN.ROW BOOL TRUE # Subtract pattern noise - PATTERN.CELL BOOL FALSE # Subtract pattern noise + PATTERN.ROW BOOL FALSE # Subtract pattern noise + PATTERN.CELL BOOL FALSE # Subtract pattern noise PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStack.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStack.config (revision 31094) @@ -93,4 +93,7 @@ OUTPUT.NOCOMP BOOL FALSE # use filerules that make conconpressed outputs +OUTPUT.LOGFLUX BOOL FALSE + +OUTPUT.REPLICATE BOOL TRUE # Recipe overrides for STACK Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStatsFromMetadata.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStatsFromMetadata.config (revision 31094) @@ -370,4 +370,5 @@ ENTRY VAL TIME_REJECT F32 SUM -dtime_reject ENTRY VAL TIME_FINAL F32 SUM -dtime_final + ENTRY VAL TIME_CONVOLVE F32 SUM -dtime_convolve ENTRY VAL TIME_PHOT F32 SUM -dtime_phot ENTRY VAL STAMP.MEAN F32 SAMPLE_MEAN -match_mean @@ -400,7 +401,7 @@ ENTRY VAL ROBUST_MEDIAN F32 ROBUST_MEDIAN -bg ENTRY VAL ROBUST_STDEV F32 RMS -bg_stdev - ENTRY VAL TIME_SUB F32 SUM -dtime_diff + ENTRY VAL TIME_DIFF F32 SUM -dtime_diff ENTRY VAL TIME_MATCH F32 SUM -dtime_match - ENTRY VAL TIME_PHOT F32 SUM -dtime_phot + ENTRY VAL TIME_PHOT F32 SUM -dtime_phot ENTRY VAL SUBTRACTION.STAMPS S32 SAMPLE_MEAN -stamps_num ENTRY VAL SUBTRACTION.DEV.MEAN F32 SAMPLE_MEAN -stamps_mean Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/psastro.config =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/psastro.config (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/psastro.config (revision 31094) @@ -139,4 +139,6 @@ REFSTAR_MASK_SATSPIKE_OFFSET F32 0.0 REFSTAR_MASK_SATSPIKE_WIDTH F32 10.0 +REFSTAR_MASK_SATSPIKE_L0 F32 200.0 +REFSTAR_MASK_SATSPIKE_WIDTH_SLOPE F32 0.00 REFSTAR_MASK_GHOST BOOL FALSE Index: /branches/eam_branches/ipp-20110213/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/eam_branches/ipp-20110213/ippconfig/recipes/reductionClasses.mdc (revision 31093) +++ /branches/eam_branches/ipp-20110213/ippconfig/recipes/reductionClasses.mdc (revision 31094) @@ -164,4 +164,23 @@ END +DEFAULT_MASKTEST METADATA + CHIP_PPIMAGE STR CHIP_MASKTEST + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR DEFAULT_RECIPE + STACKPHOT STR STACKPHOT + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND +END + # reduction class specifically for warpwarp diffs: WARPWARP METADATA