Changeset 31026

Timestamp:

Mar 23, 2011, 12:04:42 PM (15 years ago)

Author:

eugene

Message:

set peak->rawFlux and peak->smoothFlux to the peak pixel value by default

Location:

branches/eam_branches/ipp-20110213

Files:

• psModules/src/objects/pmPeaks.c (modified) (1 diff)
• psModules/src/objects/pmSourceIO_SMPDATA.c (modified) (1 diff)
• psphot/src/psphotLoadSRCTEXT.c (modified) (1 diff)
• psphot/src/psphotMergeSources.c (modified) (1 diff)
• psphot/src/psphotSourceMatch.c (modified) (1 diff)

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

@@ -151 +151 @@
     tmp->y = y;
     tmp->detValue        = value;
-    tmp->rawFlux         = NAN;
+    tmp->rawFlux         = value; // set this by default: it is up to the user to supply a better value
     tmp->rawFluxStdev    = NAN;
-    tmp->smoothFlux      = NAN;
+    tmp->smoothFlux      = value; // set this by default: it is up to the user to supply a better value
     tmp->smoothFluxStdev = NAN;
     // tmp->SN = 0;

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

@@ -205 +205 @@
 
         source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE);
-        source->peak->rawFlux = peakFlux;
 
         sources->data[i] = source;

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

@@ -78 +78 @@
 
             source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE);
-            source->peak->rawFlux = peakFlux;
-            source->peak->smoothFlux = peakFlux;
             source->peak->dx   = dPAR[PM_PAR_XPOS];
             source->peak->dy   = dPAR[PM_PAR_YPOS];

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

@@ -337 +337 @@
         peak->xf = xpos;
         peak->yf = ypos;
-        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);

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

@@ -229 +229 @@
             int col0 = readout->image->col0;
 
-            // XXX the peak type is not really used in psphot
-            // PM_PEAK_LONE is certainly not true, but irrelevant
+            // The peak type is not used in psphot. PM_PEAK_LONE may be wrong, but irrelevant
             float peakFlux = readout->image->data.F32[(int)(obj->y-row0-0.5)][(int)(obj->x-col0-0.5)];
             pmPeak *peak = pmPeakAlloc(obj->x, obj->y, peakFlux, PM_PEAK_LONE);
-            peak->rawFlux = peakFlux;
-            peak->smoothFlux = peakFlux;
             peak->xf = obj->x;
             peak->yf = obj->y;