Changeset 32689 for branches/eam_branches/ipp-20111110/psphot/src/psphotOutput.c

Timestamp:

Nov 17, 2011, 1:09:10 PM (15 years ago)

Author:

eugene

Message:

correctly handle the second pass in the detection image: the code was creating duplicate detections in 2 ways: 1) the source subtraction before the second pass was only being applied to the SRC, not the DET image, thus all 1st pass detections were also found as 2nd pass detections; 2) the DBL star fitting function was causing trouble, with the two positions merging to a single object -- this was considered a success, but left behind flux in the subtracted image (and garbage detections in general); Ive turned off the DBL fitting for now as I am not convinced that code is ready

File:

• branches/eam_branches/ipp-20111110/psphot/src/psphotOutput.c (modified) (2 diffs)

branches/eam_branches/ipp-20111110/psphot/src/psphotOutput.c

@@ -414 +414 @@
     char filename[64];
 
-    // XXX uncomment to disreturn true;
+    // XXX dump tests are disabled unless this is commented out:
+    return true;
 
     bool status = true;
@@ -453 +454 @@
 
             // XXX only dump a given region
-            if (peak->xf < 20) continue;
-            if (peak->yf < 20) continue;
-            if (peak->xf > 40) continue;
-            if (peak->yf > 70) continue;
+            // if (peak->xf < 20) continue;
+            // if (peak->yf < 20) continue;
+            // if (peak->xf > 40) continue;
+            // if (peak->yf > 70) continue;
 
             float Msum = source->moments ? source->moments->Sum : NAN;
             float Mx   = source->moments ? source->moments->Mx : NAN;
             float My   = source->moments ? source->moments->My : NAN;
-            float Npix = source->moments ? source->moments->nPixels : NAN;
-            fprintf (f, "%f %f  : %f %f : %f %f\n", peak->xf, peak->yf, Mx, My, Msum, Npix);
+            // float Npix = source->moments ? source->moments->nPixels : NAN;
+            float Io = source->modelPSF ? source->modelPSF->params->data.F32[PM_PAR_I0] : NAN;
+            fprintf (f, "%d %f %f  : %f %f : %f %f\n", source->imageID, peak->xf, peak->yf, Mx, My, Msum, Io);
         }
     }