Changeset 26317

Timestamp:

Dec 2, 2009, 9:43:55 AM (16 years ago)

Author:

eugene

Message:

adding visualization and fixing the S/N of peaks loaded from smf files

Location:

branches/eam_branches/20091201

Files:

• psModules/src/objects/pmSourceIO_CMF_PS1_V2.c (modified) (1 diff)
• psphot/src/psphot.h (modified) (1 diff)
• psphot/src/psphotFindDetections.c (modified) (1 diff)
• psphot/src/psphotMergeSources.c (modified) (1 diff)
• psphot/src/psphotSourceStats.c (modified) (1 diff)
• psphot/src/psphotVisual.c (modified) (3 diffs)

branches/eam_branches/20091201/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c

@@ -304 +304 @@
         source->peak->dx   = dPAR[PM_PAR_XPOS];
         source->peak->dy   = dPAR[PM_PAR_YPOS];
+        source->peak->SN   = sqrt(source->peak->flux); // XXX a proxy: various functions sort by peak S/N
 
         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");

branches/eam_branches/20091201/psphot/src/psphot.h

@@ -182 +182 @@
 bool psphotVisualShowImage (pmReadout *readout);
 bool psphotVisualShowBackground (pmConfig *config, const pmFPAview *view, pmReadout *readout);
-bool psphotVisualShowSignificance (psImage *image);
+bool psphotVisualShowSignificance (psImage *image, float min, float max);
 bool psphotVisualShowPeaks (pmDetections *detections);
 bool psphotVisualShowFootprints (pmDetections *detections);

branches/eam_branches/20091201/psphot/src/psphotFindDetections.c

@@ -39 +39 @@
     psImage *significance = psphotSignificanceImage (readout, recipe, pass, maskVal);
 
-    // display the backsub and backgnd images
-    psphotVisualShowSignificance (significance);
+    // display the significance image
+    psphotVisualShowSignificance (significance, -1.0, 25.0*25.0);
+
+    // XXX getting some strange results from significance image
+    {
+        psImage *lsig = (psImage *) psUnaryOp (NULL, significance, "log");
+        psphotVisualShowSignificance (lsig, 0.0, 4.0);
+        psFree (lsig);
+    }   
 
     // detect the peaks in the significance image

branches/eam_branches/20091201/psphot/src/psphotMergeSources.c

@@ -124 +124 @@
         }
 
+        // use the existing peak information, otherwise generate a new peak
+        if (source->peak) {
+            psArrayAdd (detections->peaks, 100, source->peak);
+            continue;
+        }
+
         float flux = powf(10.0, -0.4 * source->psfMag);
         float xpos = model->params->data.F32[PM_PAR_XPOS];

branches/eam_branches/20091201/psphot/src/psphotSourceStats.c

@@ -418 +418 @@
         psMetadataAddF32 (regionMD, PS_LIST_TAIL, "PSF.CLUMP.DY", PS_META_REPLACE, "psf clump center", psfClump.dY);
 
-        // psphotVisualPlotMoments (recipe, sources);
+        psphotVisualPlotMoments (recipe, analysis, sources);
 
         Sout[i] = sqrt(0.5*(psfClump.X + psfClump.Y)) / sigma[i];

branches/eam_branches/20091201/psphot/src/psphotVisual.c

@@ -171 +171 @@
     if (kapa == -1) return false;
 
-    // psphotVisualShowMask (kapa, readout->mask, "mask", 2);
+    psphotVisualShowMask (kapa, readout->mask, "mask", 2);
     psphotVisualScaleImage (kapa, readout->variance, readout->mask, "variance", 1);
     psphotVisualScaleImage (kapa, readout->image, readout->mask, "image", 0);
@@ -204 +204 @@
 }
 
-bool psphotVisualShowSignificance (psImage *image) {
+bool psphotVisualShowSignificance (psImage *image, float min, float max) {
 
     if (!pmVisualIsVisual()) return true;
@@ -211 +211 @@
     if (kapa == -1) return false;
 
-    psphotVisualRangeImage (kapa, image, "signif", 2, -1.0, 25.0*25.0);
+    psphotVisualRangeImage (kapa, image, "signif", 2, min, max);
 
     pmVisualAskUser(NULL);