Changeset 27498

Timestamp:

Mar 28, 2010, 4:21:51 PM (16 years ago)

Author:

eugene

Message:

fix diff stats for low-significance sources

Location:

branches/eam_branches/20100225/psModules/src

Files:

• objects/pmSource.c (modified) (1 diff)
• objects/pmSourcePhotometry.c (modified) (1 diff)
• psmodules.h (modified) (1 diff)

branches/eam_branches/20100225/psModules/src/objects/pmSource.c

@@ -54 +54 @@
     psFree(tmp->moments);
     psFree(tmp->diffStats);
+    psFree(tmp->blends);
     psTrace("psModules.objects", 10, "---- end ----\n");
 }

branches/eam_branches/20100225/psModules/src/objects/pmSourcePhotometry.c

@@ -404 +404 @@
             if (SN > +FLUX_LIMIT) { 
                 nGood ++;
-                fGood += flux->data.F32[iy][ix];
+                fGood += fabs(flux->data.F32[iy][ix]);
             }
 
             if (SN < -FLUX_LIMIT) { 
                 nBad ++;
-                fBad += flux->data.F32[iy][ix];
+                fBad += fabs(flux->data.F32[iy][ix]);
             }
         }
     }
 
-    source->diffStats->fRatio     = fGood / (fGood + fBad);        
-    source->diffStats->nRatioBad  = nGood / (nGood + nBad);        
-    source->diffStats->nRatioMask = nGood / (nGood + nMask);       
-    source->diffStats->nRatioAll  = nGood / (nGood + nMask + nBad);
     source->diffStats->nGood      = nGood;
+    source->diffStats->fRatio     = (fGood + fBad         == 0.0) ? NAN : fGood / (fGood + fBad);          
+    source->diffStats->nRatioBad  = (nGood + nBad         == 0)   ? NAN : nGood / (float) (nGood + nBad);          
+    source->diffStats->nRatioMask = (nGood + nMask        == 0)   ? NAN : nGood / (float) (nGood + nMask);         
+    source->diffStats->nRatioAll  = (nGood + nMask + nBad == 0)   ? NAN : nGood / (float) (nGood + nMask + nBad);
 
     return (true);

branches/eam_branches/20100225/psModules/src/psmodules.h

@@ -116 +116 @@
 #include <pmMoments.h>
 #include <pmSourceExtendedPars.h>
-#include <pmSourceDiffPars.h>
+#include <pmSourceDiffStats.h>
 #include <pmResiduals.h>
 #include <pmGrowthCurve.h>