Changeset 30975 for branches/eam_branches/ipp-20110213/psphot/src/psphotMergeSources.c

Timestamp:

Mar 18, 2011, 2:10:35 PM (15 years ago)

Author:

eugene

Message:

we had 3 items conceptually equivalent to the brightness of a peak: "value", "flux", and "SN"; Ive modified pmPeak to carry explicitly named elements "rawFlux", "smoothFlux", and "detValue". Ive also added the corresponding variance values for rawFlux and smoothFlux. This lets us choose independently of the peak detection process whether flux comparisons are done relative to the smoothed or unsmoothed image. It also simplifies tests of the peak flux compared to something else

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotMergeSources.c (modified) (5 diffs)

branches/eam_branches/ipp-20110213/psphot/src/psphotMergeSources.c

@@ -111 +111 @@
 
                 // the supplied peak flux needs to be re-normalized
-                source->peak->flux = 1.0;
-                source->peak->value = 1.0;
+                source->peak->rawFlux = 1.0;
+                source->peak->smoothFlux = 1.0;
+                source->peak->detValue = 1.0;
 
                 // drop the loaded source modelPSF
@@ -282 +283 @@
     for (int i = 0; i < sources->n; i++) {
       pmSource *source = sources->data[i];
-      source->peak->flux = source->moments->Peak;
+      source->peak->rawFlux = source->moments->Peak;
+      source->peak->smoothFlux = source->moments->Peak;
     }
 
@@ -332 +334 @@
         float ypos = model->params->data.F32[PM_PAR_YPOS];
 
-        pmPeak *peak = pmPeakAlloc(xpos, ypos, 1.0, PM_PEAK_LONE);
+        pmPeak *peak = pmPeakAlloc(xpos, ypos, flux, PM_PEAK_LONE);
         peak->xf = xpos;
         peak->yf = ypos;
-        peak->flux = flux; // this are being set wrong, but does it matter?
-
-        if (isfinite (source->errMag) && (source->errMag > 0.0)) {
-          peak->SN = 1.0 / source->errMag;
-        } else {
-          peak->SN = 0.0;
-        }
+        peak->rawFlux = flux; // this are being set wrong, but does it matter?
+        peak->smoothFlux = flux; // this are being set wrong, but does it matter?
 
         psArrayAdd (detections->peaks, 100, peak);
@@ -383 +380 @@
         float ypos = model->params->data.F32[PM_PAR_YPOS];
 
-        pmPeak *peak = pmPeakAlloc(xpos, ypos, 1.0, PM_PEAK_LONE);
+        pmPeak *peak = pmPeakAlloc(xpos, ypos, flux, PM_PEAK_LONE);
         peak->xf = xpos;
         peak->yf = ypos;
-        peak->flux = flux; // this are being set wrong, but does it matter?
-
-        if (isfinite (source->errMag) && (source->errMag > 0.0)) {
-          peak->SN = 1.0 / source->errMag;
-        } else {
-          peak->SN = 0.0;
-        }
+        peak->rawFlux = flux; // this are being set wrong, but does it matter?
+        peak->smoothFlux = flux; // this are being set wrong, but does it matter?
 
         source->peak = peak;
@@ -686 +678 @@
         objectsOut->data[k] = objectOut;
 
-        objectOut->SN = objectSrc->SN;
-        objectOut->x  = objectSrc->x;
-        objectOut->y  = objectSrc->y;
+        objectOut->flux = objectSrc->flux;
+        objectOut->x    = objectSrc->x;
+        objectOut->y    = objectSrc->y;
         
         objectOut->sources = psArrayAlloc(objectSrc->sources->n);