Index: trunk/ippconfig/gpc1/format_20080925.config =================================================================== --- trunk/ippconfig/gpc1/format_20080925.config (revision 30040) +++ trunk/ippconfig/gpc1/format_20080925.config (revision 30049) @@ -235,4 +235,5 @@ CELL.YPARITY STR ATM2_2 + CHIP.VIDEOCELL STR CELLMODE # XY24 is bad, so get it from the database; all others from header CHIP.TEMP.DEPEND STR CHIP.NAME Index: trunk/ippconfig/gpc1/format_20080929.config =================================================================== --- trunk/ippconfig/gpc1/format_20080929.config (revision 30040) +++ trunk/ippconfig/gpc1/format_20080929.config (revision 30049) @@ -230,4 +230,5 @@ CELL.YPARITY STR ATM2_2 + CHIP.VIDEOCELL STR CELLMODE # XY24 is bad, so get it from the database; all others from header CHIP.TEMP.DEPEND STR CHIP.NAME Index: trunk/ippconfig/gpc1/format_20081011.config =================================================================== --- trunk/ippconfig/gpc1/format_20081011.config (revision 30040) +++ trunk/ippconfig/gpc1/format_20081011.config (revision 30049) @@ -221,4 +221,5 @@ CELL.YPARITY STR ATM2_2 + CHIP.VIDEOCELL STR CELLMODE # XY24 is bad, so get it from the database; all others from header CHIP.TEMP.DEPEND STR CHIP.NAME Index: trunk/ippconfig/gpc1/format_20090120.config =================================================================== --- trunk/ippconfig/gpc1/format_20090120.config (revision 30040) +++ trunk/ippconfig/gpc1/format_20090120.config (revision 30049) @@ -209,4 +209,5 @@ FPA.BURNTOOL.APPLIED STR BTOOLAPP + CHIP.VIDEOCELL STR CELLMODE FPA.PON.TIME STR PONTIME Index: trunk/ippconfig/gpc1/format_20090220.config =================================================================== --- trunk/ippconfig/gpc1/format_20090220.config (revision 30040) +++ trunk/ippconfig/gpc1/format_20090220.config (revision 30049) @@ -209,4 +209,5 @@ FPA.BURNTOOL.APPLIED STR BTOOLAPP + CHIP.VIDEOCELL STR CELLMODE FPA.PON.TIME STR PONTIME Index: trunk/ippconfig/gpc1/format_20100122.config =================================================================== --- trunk/ippconfig/gpc1/format_20100122.config (revision 30040) +++ trunk/ippconfig/gpc1/format_20100122.config (revision 30049) @@ -209,4 +209,5 @@ FPA.BURNTOOL.APPLIED STR BTOOLAPP + CHIP.VIDEOCELL STR CELLMODE FPA.PON.TIME STR PONTIME Index: trunk/ippconfig/gpc1/format_orig.config =================================================================== --- trunk/ippconfig/gpc1/format_orig.config (revision 30040) +++ trunk/ippconfig/gpc1/format_orig.config (revision 30049) @@ -217,4 +217,5 @@ FPA.BURNTOOL.APPLIED STR BTOOLAPP + CHIP.VIDEOCELL STR CELLMODE FPA.PON.TIME STR PONTIME Index: trunk/ippconfig/recipes/nightly_science.config =================================================================== --- trunk/ippconfig/recipes/nightly_science.config (revision 30040) +++ trunk/ippconfig/recipes/nightly_science.config (revision 30049) @@ -1,32 +1,36 @@ -RETENTION_TIME U16 9000 - CLEAN_MODES MULTI CLEAN_MODES METADATA - MODE STR CHIP - COMMAND STR chiptool + MODE STR CHIP + COMMAND STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ RETENTION_TIME U16 30 END CLEAN_MODES METADATA - MODE STR WARP - COMMAND STR warptool + MODE STR WARP + COMMAND STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ RETENTION_TIME U16 7 END CLEAN_MODES METADATA - MODE STR DIFF - COMMAND STR difftool + MODE STR DIFF + COMMAND STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ RETENTION_TIME S16 30 -# RETENTION_TIME S16 -1 -END -CLEAN_MODES METADATA - MODE STR DIST - COMMAND STR disttool +END +CLEAN_MODES METADATA + MODE STR DIST + COMMAND STR disttool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -full -set_label goto_cleaned -label @LABEL@ -time_stamp_end @CURRENT_DATE@ RETENTION_TIME S16 10 - ALTERNATE_CMD STR A -END -CLEAN_MODES METADATA - MODE STR MAGICDS - COMMAND STR magicdstool +END +CLEAN_MODES METADATA + 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 - ALTERNATE_CMD STR B +END + +END_OF_NIGHT MULTI +END_OF_NIGHT METADATA + NAME STR MORNING_DARKS + OBSMODE STR ENGINEERING + EXPTYPE STR DARK + OBJECT STR ENGINEERING + COMMENT STR darks_morn% END @@ -43,8 +47,4 @@ MACRO_DEFINITIONS MULTI -#MACRO_DEFINITIONS METADATA -# PROC_MODE STR check_chips -# MACRO STR echo survey.del.destreak @LABEL@ -#END MACRO_DEFINITIONS METADATA PROC_MODE STR queue_chips @@ -55,360 +55,199 @@ MACRO STR survey.add.destreak @LABEL@ /data/ipp053.0/gpc1_destreak END -#MACRO_DEFINITIONS METADATA -# PROC_MODE STR check_confirm_stacks -# MACRO STR echo survey.add.destreak @LABEL@ /data/ipp053.0/gpc1_destreak -#END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR clean_old -# MACRO STR + +TARGETS MULTI +TARGETS METADATA + NAME STR M31 + DISTRIBUTION STR M31 + TESS STR M31 + OBSMODE STR M31 + OBJECT STR M31% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD01 + DISTRIBUTION STR MD01 + TESS STR MD01.V2 + OBSMODE STR MD + OBJECT STR MD01% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD02 + DISTRIBUTION STR MD02 + TESS STR MD02 + OBSMODE STR MD + OBJECT STR MD02% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD03 + DISTRIBUTION STR MD03 + TESS STR MD03 + OBSMODE STR MD + OBJECT STR MD03% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD04 + DISTRIBUTION STR MD04 + TESS STR MD04 + OBSMODE STR MD + OBJECT STR MD04% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD05 + DISTRIBUTION STR MD05 + TESS STR MD05 + OBSMODE STR MD + OBJECT STR MD05% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD06 + DISTRIBUTION STR MD06 + TESS STR MD06 + OBSMODE STR MD + OBJECT STR MD06% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD07 + DISTRIBUTION STR MD07 + TESS STR MD07 + OBSMODE STR MD + OBJECT STR MD07% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD08 + DISTRIBUTION STR MD08 + TESS STR MD08.V2 + OBSMODE STR MD + OBJECT STR MD08% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD09 + DISTRIBUTION STR MD09 + TESS STR MD09.V2 + OBSMODE STR MD + OBJECT STR MD09% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD10 + DISTRIBUTION STR MD10 + TESS STR MD10.V2 + OBSMODE STR MD + OBJECT STR MD10% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR MD11 + DISTRIBUTION STR MD11 + TESS STR MD11.V2 + OBSMODE STR MD + OBJECT STR MD11% + STACKABLE BOOL TRUE + MIN_STACK U16 8 + DIFFABLE BOOL FALSE + DIST S16 30 +END +TARGETS METADATA + NAME STR STS + DISTRIBUTION STR STS + TESS STR STS + OBSMODE STR STS% + OBJECT STR STS% + STACKABLE BOOL FALSE + DIFFABLE BOOL FALSE +END +TARGETS METADATA + NAME STR SweetSpot + DISTRIBUTION STR SweetSpot + TESS STR RINGS.V0 + OBSMODE STR SS + STACKABLE BOOL FALSE + DIFFABLE BOOL TRUE + WARP S16 60 +END +TARGETS METADATA + NAME STR OSS + DISTRIBUTION STR SweetSpot + TESS STR RINGS.V0 + OBSMODE STR OSS + STACKABLE BOOL FALSE + DIFFABLE BOOL TRUE +END +TARGETS METADATA + NAME STR CNP + DISTRIBUTION STR CNP + TESS STR RINGS.V0 + OBSMODE STR CNP + STACKABLE BOOL FALSE + DIFFABLE BOOL FALSE +END +TARGETS METADATA + NAME STR ThreePi + DISTRIBUTION STR ThreePi + TESS STR RINGS.V0 + OBSMODE STR 3PI + STACKABLE BOOL FALSE + DIFFABLE BOOL TRUE + CHIP S16 14 + DIFF S16 14 +END +# This is a hack, and I freely admit it. +# Removed the rest because we do not regularly run microtests. +# TARGETS METADATA +# NAME STR microtestMD01 +# TESS STR MD01 +# OBJECT STR MD01% +# COMMENT STR Microtest Obs% +# STACKABLE BOOL TRUE # END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR check_registration -# MACRO STR +# TARGETS METADATA +# NAME STR microtestMD01.noPattern +# TESS STR MD01 +# OBJECT STR MD01% +# COMMENT STR Microtest Obs% +# REDUCTION STR MICROTEST_NOPATTERN +# STACKABLE BOOL TRUE # END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR define_burntool -# MACRO STR -# END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR queue_burntool -# MACRO STR -# END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR check_stacks -# MACRO STR -# END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR queue_stacks -# MACRO STR -# END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR check_sweetspot -# MACRO STR -# END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR queue_sweetspot -# MACRO STR -# END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR check_dqstats -# MACRO STR -# END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR queue_dqstats -# MACRO STR -# END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR check_detrends -# MACRO STR -# END -# MACRO_DEFINITIONS METADATA -# PROC_MODE STR queue_detrends -# MACRO STR -# END - -TARGETS MULTI -TARGETS METADATA - NAME STR M31 - TESS STR M31 - OBSMODE STR M31 - OBJECT STR M31% -# COMMENT STR M31% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD01 - TESS STR MD01.V2 - OBSMODE STR MD - OBJECT STR MD01% -# COMMENT STR %MD01% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD02 - TESS STR MD02.V2 - OBSMODE STR MD - OBJECT STR MD02% -# COMMENT STR %MD02% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD03 - TESS STR MD03 - OBSMODE STR MD - OBJECT STR MD03% -# COMMENT STR %MD03% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD04 - TESS STR MD04 - OBSMODE STR MD - OBJECT STR MD04% -# COMMENT STR %MD04% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD05 - TESS STR MD05 - OBSMODE STR MD - OBJECT STR MD05% -# COMMENT STR %MD05% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD06 - TESS STR MD06 - OBSMODE STR MD - OBJECT STR MD06% -# COMMENT STR %MD06% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD07 - TESS STR MD07 - OBSMODE STR MD - OBJECT STR MD07% -# COMMENT STR %MD07% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD08 - TESS STR MD08.V2 - OBSMODE STR MD - OBJECT STR MD08% -# COMMENT STR %MD08% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD09 - TESS STR MD09.V2 - OBSMODE STR MD - OBJECT STR MD09% -# COMMENT STR %MD09% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD10 - TESS STR MD10.V2 - OBSMODE STR MD - OBJECT STR MD10% -# COMMENT STR %MD10% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR MD11 - TESS STR MD11.V2 - OBSMODE STR MD - OBJECT STR MD11% -# COMMENT STR %MD11% - STACKABLE BOOL TRUE - DIST S16 30 -END -TARGETS METADATA - NAME STR STS - TESS STR STS - OBSMODE STR STS% - OBJECT STR STS% -# COMMENT STR Stellar Transit% - STACKABLE BOOL FALSE -END -TARGETS METADATA - NAME STR SweetSpot - TESS STR RINGS.V0 - OBSMODE STR SS -# OBJECT STR SS - STACKABLE BOOL FALSE - EXTRA_PROCESSING BOOL TRUE -# NOCLEAN BOOL TRUE - WARP S16 60 -END -TARGETS METADATA - NAME STR OSS - DISTRIBUTION STR SweetSpot - TESS STR RINGS.V0 - OBSMODE STR OSS - STACKABLE BOOL FALSE - EXTRA_PROCESSING BOOL TRUE -END -TARGETS METADATA - NAME STR CNP - DISTRIBUTION STR CNP - TESS STR RINGS.V0 - OBSMODE STR CNP - STACKABLE BOOL FALSE - EXTRA_PROCESSING BOOL FALSE -END -TARGETS METADATA - NAME STR ThreePi - TESS STR RINGS.V0 - OBSMODE STR 3PI -# OBJECT STR 3PI - STACKABLE BOOL FALSE - CHIP S16 14 - DIFF S16 14 -END -# This is a hack, and I freely admit it. -TARGETS METADATA - NAME STR microtestMD01 - TESS STR MD01 - OBJECT STR MD01% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD01.noPattern - TESS STR MD01 - OBJECT STR MD01% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD02 - TESS STR MD02 - OBJECT STR MD02% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD02.noPattern - TESS STR MD02 - OBJECT STR MD02% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD03 - TESS STR MD03 - OBJECT STR MD03% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD03.noPattern - TESS STR MD03 - OBJECT STR MD03% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD04 - TESS STR MD04 - OBJECT STR MD04% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD04.noPattern - TESS STR MD04 - OBJECT STR MD04% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD05 - TESS STR MD05 - OBJECT STR MD05% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD05.noPattern - TESS STR MD05 - OBJECT STR MD05% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD06 - TESS STR MD06 - OBJECT STR MD06% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD06.noPattern - TESS STR MD06 - OBJECT STR MD06% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD07 - TESS STR MD07 - OBJECT STR MD07% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD07.noPattern - TESS STR MD07 - OBJECT STR MD07% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD08 - TESS STR MD08 - OBJECT STR MD08% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD08.noPattern - TESS STR MD08 - OBJECT STR MD08% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD09 - TESS STR MD09 - OBJECT STR MD09% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD09.noPattern - TESS STR MD09 - OBJECT STR MD09% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD10 - TESS STR MD10 - OBJECT STR MD10% - COMMENT STR Microtest Obs% - STACKABLE BOOL TRUE -END -TARGETS METADATA - NAME STR microtestMD10.noPattern - TESS STR MD10 - OBJECT STR MD10% - COMMENT STR Microtest Obs% - REDUCTION STR MICROTEST_NOPATTERN - STACKABLE BOOL TRUE -END # Detrend verification data @@ -420,6 +259,5 @@ REF_ID S64 299 REF_ITER S32 0 -# FILTER STR - MAX S32 10 + MAX_EXP S32 10 END @@ -431,5 +269,5 @@ REF_ITER S32 0 FILTER STR g.00000 - MAX S32 10 + MAX_EXP S32 10 END @@ -441,5 +279,5 @@ REF_ITER S32 0 FILTER STR r.00000 - MAX S32 10 + MAX_EXP S32 10 END @@ -451,5 +289,5 @@ REF_ITER S32 0 FILTER STR i.00000 - MAX S32 10 + MAX_EXP S32 10 END @@ -461,5 +299,5 @@ REF_ITER S32 0 FILTER STR z.00000 - MAX S32 10 + MAX_EXP S32 10 END @@ -471,5 +309,5 @@ REF_ITER S32 0 FILTER STR y.00000 - MAX S32 10 + MAX_EXP S32 10 END @@ -481,5 +319,5 @@ REF_ITER S32 0 FILTER STR w.00000 - MAX S32 10 -END - + MAX_EXP S32 10 +END + Index: trunk/ippconfig/recipes/ppStats.config =================================================================== --- trunk/ippconfig/recipes/ppStats.config (revision 30040) +++ trunk/ippconfig/recipes/ppStats.config (revision 30049) @@ -236,5 +236,8 @@ CONCEPT STR FPA.BURNTOOL.APPLIED + CONCEPT STR FPA.PON.TIME # time since last power on + + CONCEPT STR CHIP.VIDEOCELL STAT STR ROBUST_MEDIAN # Background estimator Index: trunk/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 30040) +++ trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 30049) @@ -45,4 +45,5 @@ ENTRY VAL FPA.PON.TIME F32 CONSTANT -pon_time # time since last power on # ENTRY VAL FPA.BURNTOOL.APPLIED S32 CONSTANT -burntool_state # + ENTRY VAL CHIP.VIDEOCELL BOOL CONSTANT -video_cells # This chip contains a video cell ENTRY VAL CHIP.TEMP F32 SAMPLE_MEAN -ccd_temp # CCD temperature ENTRY VAL CELL.EXPOSURE F32 SAMPLE_MEAN -exp_time # Exposure time