Changeset 31992 for branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF.c.in

Timestamp:

Aug 3, 2011, 10:32:41 AM (15 years ago)

Author:

eugene

Message:

add several non-parametric values to extended source table; convert pmSourceIO_* functions to use autogenerated code for different formats; add optional timing marks to pmSourceFitPCM

File:

• branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF.c.in (modified) (3 diffs)

branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -55 +55 @@
 // followed by a zero-size matrix, followed by the table data
 
-// # define MODE @CMFMODE@
 bool pmSourcesWrite_CMF_@CMFMODE@ (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname, psMetadata *recipe)
 {
@@ -595 +594 @@
             assert (model);
 
+            pmSourceExtFitPars *extPars = source->extFitPars->data[j];
+            assert (extPars);
+
             // skip models which were not actually fitted
             if (model->flags & PM_MODEL_STATUS_BADARGS) continue;
@@ -617 +619 @@
             psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_INST_MAG",     0, "EXT fit instrumental magnitude",             model->mag);
             psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_INST_MAG_SIG", 0, "Sigma of PSF instrumental magnitude",        model->magErr);
+
+            psMetadataAddF32 (row, PS_LIST_TAIL, "MOMENTS_XX",       0, "second moment in x",                         extPars->Mxx);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "MOMENTS_XY",       0, "second moment in x,y",                       extPars->Mxy);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "MOMENTS_YY",       0, "second moment in y",                         extPars->Myy);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "MOMENTS_R1",       0, "first radial moment",                        extPars->Mrf);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "MOMENTS_RH",       0, "half radial moment",                         extPars->Mrh);
+
+            psMetadataAddF32 (row, PS_LIST_TAIL, "PSF_INST_MAG",     0, "PSF fit instrumental magnitude",             source->psfMag);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "AP_MAG",           0, "PSF-sized aperture magnitude",               source->apMag);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "KRON_MAG",         0, "Kron Mag",                                   extPars->krMag);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", 0, "peak flux expressed as a magnitude",         extPars->peakMag);
 
             psMetadataAddF32 (row, PS_LIST_TAIL, "NPARAMS",          0, "number of model parameters",                 model->params->n);