Changeset 30974 for branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceIO_RAW.c

Timestamp:

Mar 18, 2011, 2:09:39 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/psModules/src/objects/pmSourceIO_RAW.c (modified) (5 diffs)

branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceIO_RAW.c

@@ -126 +126 @@
                  source[0].apMag, source[0].type, source[0].mode,
                  logChi, logChiNorm,
-                 source[0].peak->SN,
+                 source[0].peak->rawFlux,
                  source[0].apRadius,
                  source[0].pixWeightNotBad,
@@ -188 +188 @@
                  log10(model[0].chisq/model[0].nDOF),
                  log10(model[0].chisqNorm/model[0].nDOF),
-                 source[0].peak->SN,
+                 source[0].peak->rawFlux,
                  source[0].apRadius,
                  source[0].pixWeightNotBad,
@@ -234 +234 @@
 
         fprintf (f, "%5d %5d  %7.1f  %7.1f %7.1f  %6.3f %6.3f  %8.1f %7.1f %7.1f %7.1f  %4d %2d\n",
-                 source->peak->x, source->peak->y, source->peak->value,
+                 source->peak->x, source->peak->y, source->peak->detValue,
                  moment->Mx, moment->My,
                  moment->Mxx, moment->Myy,
@@ -270 +270 @@
             continue;
         fprintf (f, "%5d %5d  %8.1f  %7.1f %7.1f  %6.3f %6.3f  %10.1f %7.1f %7.1f %7.1f  %4d %2d %#5x\n",
-                 source->peak->x, source->peak->y, source->peak->value,
+                 source->peak->x, source->peak->y, source->peak->detValue,
                  source->moments->Mx, source->moments->My,
                  source->moments->Mxx, source->moments->Myy,
@@ -299 +299 @@
             continue;
         fprintf (f, "%5d %5d  %7.1f %7.2f %7.2f %7.2f\n",
-                 peak->x, peak->y, peak->value, peak->SN, peak->xf, peak->yf);
-    }
-    fclose (f);
-    return true;
-}
-
+                 peak->x, peak->y, peak->detValue, peak->rawFlux, peak->xf, peak->yf);
+    }
+    fclose (f);
+    return true;
+}
+