Changeset 29935 for trunk/psModules/src/objects

Timestamp:

Dec 5, 2010, 9:33:17 PM (15 years ago)

Author:

eugene

Message:

support for compressed metadata config files; removed commented-out code in pmNonLinear.c; add functions to set file and data status in pmFPAfiles; do not fail in pmFPAfileIO on inactive internal files; S/N for low-sig sources is always positive; do not copy NULL pixels in pmSourceCopy

Location:

trunk/psModules/src/objects

Files:

• pmSource.c (modified) (1 diff)
• pmSourcePhotometry.c (modified) (2 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -189 +189 @@
     // pixels.  Modifying these pixels (ie, subtracting the model) will affect the pixels seen
     // by all copies.
-    source->pixels   = psImageCopyView(NULL, in->pixels);
-    source->variance   = psImageCopyView(NULL, in->variance);
+    source->pixels   = in->pixels   ? psImageCopyView(NULL, in->pixels)   : NULL;
+    source->variance = in->variance ? psImageCopyView(NULL, in->variance) : NULL;
     source->maskView = in->maskView ? psImageCopyView(NULL, in->maskView) : NULL;
 

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -107 +107 @@
     // XXX handle negative flux, low-significance
     if (model->dparams->data.F32[PM_PAR_I0] > 0) {
-        SN = model->params->data.F32[PM_PAR_I0] / model->dparams->data.F32[PM_PAR_I0];
+        SN = fabs(model->params->data.F32[PM_PAR_I0] / model->dparams->data.F32[PM_PAR_I0]);
         source->errMag = 1.0 / SN;
     } else {
@@ -331 +331 @@
     }
     if (apFluxOut) *apFluxOut = apFlux;
-    if (apFluxErr) *apFluxErr = sqrt(apFluxVar);
+    if (apFluxErr) *apFluxErr = sqrt(fabs(apFluxVar));
 
     if (apFlux <= 0) {