Changeset 34496

Timestamp:

Oct 3, 2012, 11:45:45 AM (14 years ago)

Author:

eugene

Message:

add EXT_ parameters needed for PS1_DV2 (EXT_FLUX, EXT_CAL_MAG, EXT_CHISQ, EXT_NDOF)

File:

• trunk/psModules/src/objects/pmSourceIO_CMF.c.in (modified) (2 diffs)

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -723 +723 @@
     sources = psArraySort (sources, pmSourceSortByFlux);
 
+    @>PS1_DV2@ float magOffset; 
+    @>PS1_DV2@ float zeroptErr; 
+    @>PS1_DV2@ float fwhmMajor; 
+    @>PS1_DV2@ float fwhmMinor;
+    @>PS1_DV2@ pmSourceOutputsCommonValues (&magOffset, &zeroptErr, &fwhmMajor, &fwhmMinor, readout, imageHeader);
+
     // we are writing one row per model; we need to write out same number of columns for each row: find the max Nparams
     int nParamMax = 0;
@@ -797 +803 @@
             @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "RA_EXT",           0, "EXT model ra coordinate",                    raPos);
             @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "DEC_EXT",          0, "EXT model dec coordinate",                   decPos);
+            @>PS1_DV2@ float instFlux = isfinite(model->mag) ? pow(10.0, -0.4*model->mag) : NAN;
+                                         @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_INST_FLUX",    0, "EXT fit instrumental counts",                instFlux);
             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);
+
+            @>PS1_DV2@ float calMag = isfinite(magOffset) ? model->mag + magOffset : NAN;
+            @>PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "EXT_CAL_MAG", PS_DATA_F32, "EXT Magnitude using supplied calibration",   calMag);
+            @>PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "EXT_CHISQ",   PS_DATA_F32, "EXT Magnitude using supplied calibration",   model->chisq);
+            @>PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "EXT_NDOF",    PS_DATA_F32, "EXT Magnitude using supplied calibration",   model->nDOF);
 
             @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "POSANGLE",   0, "position angle at source (degrees)",         posAngle);