Index: branches/eam_branches/psphot.stack.20100120/src/psphotOutput.c =================================================================== --- branches/eam_branches/psphot.stack.20100120/src/psphotOutput.c (revision 26688) +++ branches/eam_branches/psphot.stack.20100120/src/psphotOutput.c (revision 26748) @@ -197,8 +197,7 @@ // these values are saved in an output header stub - they are added to either the PHU header -// (CMP) or the MEF table header (CMF) XXX these are currently carried by the recipe -- this -// will not work in a Stack context XXX they should be place in the readout->analysis of the -// given image or directly on the output header -psMetadata *psphotDefineHeader (psMetadata *recipe) { +// (CMP) or the MEF table header (CMF). before the header is created, each readout has these +// values stored on readout->analysis +psMetadata *psphotDefineHeader (psMetadata *analysis) { bool status = true; @@ -207,75 +206,75 @@ // write necessary information to output header - psMetadataItemSupplement (&status, header, recipe, "ZERO_PT"); - psMetadataItemSupplement (&status, header, recipe, "PHOTCODE"); - - psMetadataItemSupplement (&status, header, recipe, "APMIFIT"); - psMetadataItemSupplement (&status, header, recipe, "DAPMIFIT"); - psMetadataItemSupplement (&status, header, recipe, "NAPMIFIT"); + psMetadataItemSupplement (&status, header, analysis, "ZERO_PT"); + psMetadataItemSupplement (&status, header, analysis, "PHOTCODE"); + + psMetadataItemSupplement (&status, header, analysis, "APMIFIT"); + psMetadataItemSupplement (&status, header, analysis, "DAPMIFIT"); + psMetadataItemSupplement (&status, header, analysis, "NAPMIFIT"); // PSF model parameters (shape values for image center) - psMetadataItemSupplement (&status, header, recipe, "NPSFSTAR"); - psMetadataItemSupplement (&status, header, recipe, "APLOSS"); - - psMetadataItemSupplement (&status, header, recipe, "FWHM_MAJ"); - psMetadataItemSupplement (&status, header, recipe, "FW_MJ_SG"); - psMetadataItemSupplement (&status, header, recipe, "FW_MJ_LQ"); - psMetadataItemSupplement (&status, header, recipe, "FW_MJ_UQ"); - - psMetadataItemSupplement (&status, header, recipe, "FWHM_MIN"); - psMetadataItemSupplement (&status, header, recipe, "FW_MN_SG"); - psMetadataItemSupplement (&status, header, recipe, "FW_MN_LQ"); - psMetadataItemSupplement (&status, header, recipe, "FW_MN_UQ"); - - psMetadataItemSupplement (&status, header, recipe, "ANGLE"); + psMetadataItemSupplement (&status, header, analysis, "NPSFSTAR"); + psMetadataItemSupplement (&status, header, analysis, "APLOSS"); + + psMetadataItemSupplement (&status, header, analysis, "FWHM_MAJ"); + psMetadataItemSupplement (&status, header, analysis, "FW_MJ_SG"); + psMetadataItemSupplement (&status, header, analysis, "FW_MJ_LQ"); + psMetadataItemSupplement (&status, header, analysis, "FW_MJ_UQ"); + + psMetadataItemSupplement (&status, header, analysis, "FWHM_MIN"); + psMetadataItemSupplement (&status, header, analysis, "FW_MN_SG"); + psMetadataItemSupplement (&status, header, analysis, "FW_MN_LQ"); + psMetadataItemSupplement (&status, header, analysis, "FW_MN_UQ"); + + psMetadataItemSupplement (&status, header, analysis, "ANGLE"); // Image Quality measurements - psMetadataItemSupplement (&status, header, recipe, "IQ_NSTAR"); - - psMetadataItemSupplement (&status, header, recipe, "IQ_FW1"); - psMetadataItemSupplement (&status, header, recipe, "IQ_FW1_E"); - psMetadataItemSupplement (&status, header, recipe, "IQ_FW2"); - psMetadataItemSupplement (&status, header, recipe, "IQ_FW2_E"); - - psMetadataItemSupplement (&status, header, recipe, "IQ_M2"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M2_ER"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M2_LQ"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M2_UQ"); - - psMetadataItemSupplement (&status, header, recipe, "IQ_M2C"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M2C_E"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M2C_L"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M2C_U"); - - psMetadataItemSupplement (&status, header, recipe, "IQ_M2S"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M2S_E"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M2S_L"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M2S_U"); - - psMetadataItemSupplement (&status, header, recipe, "IQ_M3"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M3_ER"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M3_LQ"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M3_UQ"); - - psMetadataItemSupplement (&status, header, recipe, "IQ_M4"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M4_ER"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M4_LQ"); - psMetadataItemSupplement (&status, header, recipe, "IQ_M4_UQ"); + psMetadataItemSupplement (&status, header, analysis, "IQ_NSTAR"); + + psMetadataItemSupplement (&status, header, analysis, "IQ_FW1"); + psMetadataItemSupplement (&status, header, analysis, "IQ_FW1_E"); + psMetadataItemSupplement (&status, header, analysis, "IQ_FW2"); + psMetadataItemSupplement (&status, header, analysis, "IQ_FW2_E"); + + psMetadataItemSupplement (&status, header, analysis, "IQ_M2"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M2_ER"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M2_LQ"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M2_UQ"); + + psMetadataItemSupplement (&status, header, analysis, "IQ_M2C"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M2C_E"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M2C_L"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M2C_U"); + + psMetadataItemSupplement (&status, header, analysis, "IQ_M2S"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M2S_E"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M2S_L"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M2S_U"); + + psMetadataItemSupplement (&status, header, analysis, "IQ_M3"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M3_ER"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M3_LQ"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M3_UQ"); + + psMetadataItemSupplement (&status, header, analysis, "IQ_M4"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M4_ER"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M4_LQ"); + psMetadataItemSupplement (&status, header, analysis, "IQ_M4_UQ"); // XXX these need to be defined from elsewhere psMetadataAdd (header, PS_LIST_TAIL, "FSATUR", PS_DATA_F32 | PS_META_REPLACE, "SATURATION MAG", 0.0); psMetadataAdd (header, PS_LIST_TAIL, "FLIMIT", PS_DATA_F32 | PS_META_REPLACE, "COMPLETENESS MAG", 0.0); - psMetadataItemSupplement (&status, header, recipe, "NSTARS"); - - psMetadataItemSupplement (&status, header, recipe, "NDET_EXT"); - psMetadataItemSupplement (&status, header, recipe, "NDET_CR"); + psMetadataItemSupplement (&status, header, analysis, "NSTARS"); + + psMetadataItemSupplement (&status, header, analysis, "NDET_EXT"); + psMetadataItemSupplement (&status, header, analysis, "NDET_CR"); // sky background model statistics - psMetadataItemSupplement (&status, header, recipe, "MSKY_MN"); - psMetadataItemSupplement (&status, header, recipe, "MSKY_SIG"); - psMetadataItemSupplement (&status, header, recipe, "MSKY_MIN"); - psMetadataItemSupplement (&status, header, recipe, "MSKY_MAX"); - psMetadataItemSupplement (&status, header, recipe, "MSKY_NX"); - psMetadataItemSupplement (&status, header, recipe, "MSKY_NY"); + psMetadataItemSupplement (&status, header, analysis, "MSKY_MN"); + psMetadataItemSupplement (&status, header, analysis, "MSKY_SIG"); + psMetadataItemSupplement (&status, header, analysis, "MSKY_MIN"); + psMetadataItemSupplement (&status, header, analysis, "MSKY_MAX"); + psMetadataItemSupplement (&status, header, analysis, "MSKY_NX"); + psMetadataItemSupplement (&status, header, analysis, "MSKY_NY"); psMetadataAddF32 (header, PS_LIST_TAIL, "DT_PHOT", PS_META_REPLACE, "elapsed psphot time", psTimerMark ("psphotReadout"));