Changeset 34415 for branches/eam_branches/ipp-20120905/psphot/src/psphotBlendFit.c

Timestamp:

Sep 7, 2012, 10:06:48 AM (14 years ago)

Author:

eugene

Message:

when growing the CR mask, copy the values into the existing readout->mask array, otherwise we lose the association to source->maskView; mask a small region for sources that have already been detected (the exclusion radius is curretnly set to 4 pixels, and is not user-specified; deactivate some test code; saturate linear fit fluxes to min valid flux (probably superfluous); calls to psphotFitSourcesLinear in psphotReadout should skip negative fluxes

File:

• branches/eam_branches/ipp-20120905/psphot/src/psphotBlendFit.c (modified) (5 diffs)

branches/eam_branches/ipp-20120905/psphot/src/psphotBlendFit.c

@@ -96 +96 @@
     assert (status && isfinite(skySig) && skySig > 0);
 
-# if (1)
+# if (0)
     // **** test block : generate an ID image where pixels are set based the source models (flux > 0.1 peak && flux > 2.0 skySig)
     psImage *IDimage = psImageAlloc (readout->image->numCols, readout->image->numRows, PS_TYPE_S32);
@@ -258 +258 @@
 
         int TEST_ON = false;
-# if (1)
+# if (0)
 # define TEST_X 653
 # define TEST_Y 466
         if ((fabs(source->peak->xf - TEST_X) < 5) && (fabs(source->peak->yf - TEST_Y) < 5)) {
             fprintf (stderr, "test object\n");
-            //  psTraceSetLevel("psLib.math.psMinimizeLMChi2", 5);
+            psTraceSetLevel("psLib.math.psMinimizeLMChi2", 5);
             TEST_ON = true;
         }
@@ -379 +379 @@
     if (!source) return false;
     if (!source->peak) return false; // XXX how can we have a peak-less source?
+
+# if (0)
+# define TEST_X 653
+# define TEST_Y 466
+        if ((fabs(source->peak->xf - TEST_X) < 5) && (fabs(source->peak->yf - TEST_Y) < 5)) {
+            fprintf (stderr, "test object\n");
+        }
+# undef TEST_X
+# undef TEST_Y
+# endif
+
     if (!source->moments) return false;
     if (source->type == PM_SOURCE_TYPE_DEFECT) return false;
@@ -473 +484 @@
 
     // what is the radius for a specific peak fraction?
-    for (int i = 0; i < logFmodel->n; i++) {
+    for (int i = 1; i < logFmodel->n; i++) {
         float logF = logFmodel->data.F32[i];
+        if (!isfinite(logF)) continue;
+
         float flux = pow(10.0, logF);
         if (flux > threshold) continue;
-        if (i == 0) continue;
         
         float logF0 = logFmodel->data.F32[i - 1];
@@ -512 +524 @@
     int ID = source->id;
 
+    fprintf (stderr, "Xo,Yo: %f,%f; radius: %f\n", Xo, Yo, radius);
+
     for (int iy = minY; iy < maxY; iy++) {
         for (int ix = minX; ix < maxX; ix++) {