Changeset 34498 for trunk

Timestamp:

Oct 3, 2012, 4:24:24 PM (14 years ago)

Author:

eugene

Message:

fixes for ppMops errors

Location:

trunk/psModules/src/objects

Files:

• pmModel.c (modified) (1 diff)
• pmSourceIO_CMF.c.in (modified) (3 diffs)
• pmSourcePhotometry.c (modified) (1 diff)

trunk/psModules/src/objects/pmModel.c

@@ -64 +64 @@
     tmp->type = type;
     tmp->mag = NAN;
+    tmp->magErr = NAN;
     tmp->chisq = NAN;
     tmp->chisqNorm = NAN;

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

@@ -787 +787 @@
             @>PS1_DV2@ double raPos = ptSky.r*PS_DEG_RAD;
             @>PS1_DV2@ double decPos = ptSky.d*PS_DEG_RAD;
+            @>PS1_DV2@ posAngle *= PS_DEG_RAD;
+            @>PS1_DV2@ pltScale *= PS_DEG_RAD*3600.0;
 
             float kronFlux = source->moments ? source->moments->KronFlux : NAN;
@@ -804 +806 @@
             @>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);
+            @>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);
@@ -811 +814 @@
             @>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@ psMetadataAdd (row, PS_LIST_TAIL, "EXT_NDOF",    PS_DATA_S32, "EXT Magnitude using supplied calibration",   model->nDOF);
 
             @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "POSANGLE",   0, "position angle at source (degrees)",         posAngle);

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -165 +165 @@
             status = pmSourcePhotometryModel (&model->mag, NULL, model);
             if (model == source->modelEXT) foundEXT = true;
+            float SN = fabs(model->params->data.F32[PM_PAR_I0] / model->dparams->data.F32[PM_PAR_I0]);
+            model->magErr = 1.0 / SN;
         }
         if (foundEXT) {