Changeset 34368 for branches/eam_branches/ipp-20120805/psphot/src/psphotVisual.c

Timestamp:

Aug 30, 2012, 6:10:52 AM (14 years ago)

Author:

eugene

Message:

some generalization of visualization code; add radial profile fits to deblend satstars (still testing)

File:

• branches/eam_branches/ipp-20120805/psphot/src/psphotVisual.c (modified) (7 diffs)

branches/eam_branches/ipp-20120805/psphot/src/psphotVisual.c

@@ -1273 +1273 @@
 }
 
-static void plotline (int myKapa, Graphdata *graphdata, float x0, float y0, float x1, float y1) 
+void plotline (int myKapa, Graphdata *graphdata, float x0, float y0, float x1, float y1) 
 {
     float x[2], y[2];
@@ -1285 +1285 @@
 }
 
-bool psphotVisualPlotRadialProfile (int myKapa, pmSource *source, psImageMaskType maskVal) {
+bool psphotVisualPlotRadialProfile (int myKapa, pmSource *source, psImageMaskType maskVal, pmSourceMode showmode) {
 
     Graphdata graphdata;
+
+    float Rmax = (showmode & PM_SOURCE_MODE_SATSTAR) ? 100.0 : 30.0;
 
     bool subtracted = (source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED);
@@ -1310 +1312 @@
         Yo = source->modelPSF->params->data.F32[PM_PAR_YPOS] - source->pixels->row0;
     } else {
-        Xo = source->moments->Mx;
-        Yo = source->moments->My;
+        Xo = source->moments->Mx - source->pixels->col0;
+        Yo = source->moments->My - source->pixels->row0;
     }
 
     for (int iy = 0; iy < source->pixels->numRows; iy++) {
         for (int ix = 0; ix < source->pixels->numCols; ix++) {
-            if (source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix]) {
+            if ((source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] & maskVal)) {
                 rb->data.F32[nb] = hypot (ix + 0.5 - Xo, iy + 0.5 - Yo) ;
                 // rb->data.F32[nb] = hypot (ix - Xo, iy - Yo) ;
@@ -1339 +1341 @@
     // examine sources to set data range
     graphdata.xmin =  -0.05;
-    graphdata.xmax = +30.05;
+    graphdata.xmax = Rmax + 0.05;
     graphdata.ymin = -0.05;
     graphdata.ymax = +8.05;
@@ -1370 +1372 @@
     // examine sources to set data range
     graphdata.xmin = -1.51;
-    graphdata.xmax = +1.51;
+    graphdata.xmax = log10(Rmax) + 0.02;
     graphdata.ymin = -0.05;
     graphdata.ymax = +8.05;
@@ -1422 +1424 @@
         params->data.F32[PM_PAR_YPOS] = 0.0;
 
-        psVector *rmod = psVectorAlloc(300, PS_TYPE_F32);
-        psVector *fmaj = psVectorAlloc(300, PS_TYPE_F32);
-        psVector *fmin = psVectorAlloc(300, PS_TYPE_F32);
+        psVector *rmod = psVectorAlloc(Rmax*10, PS_TYPE_F32);
+        psVector *fmaj = psVectorAlloc(Rmax*10, PS_TYPE_F32);
+        psVector *fmin = psVectorAlloc(Rmax*10, PS_TYPE_F32);
 
         psVector *coord = psVectorAlloc(2, PS_TYPE_F32);
@@ -1569 +1571 @@
         if (!(source->mode & showmode)) continue;
 
-        psphotVisualPlotRadialProfile (myKapa, source, maskVal);
+        psphotVisualPlotRadialProfile (myKapa, source, maskVal, showmode);
+
+        if (pmVisualTestLevel("psphot.image", 1)) {
+          int display = psphotKapaChannel (1);
+          KiiCenter (display, source->peak->xf, source->peak->yf, 1);
+          KiiOverlay overlay;
+          overlay.x = source->peak->xf;
+          overlay.y = source->peak->yf;
+          overlay.dx = 5;
+          overlay.dy = 5;
+          overlay.angle = 0.0;
+          overlay.type = KiiOverlayTypeByName ("circle");
+          KiiLoadOverlay (display, &overlay, 1, "red");
+          overlay.x = source->moments->Mx;
+          overlay.y = source->moments->My;
+          overlay.dx = 8;
+          overlay.dy = 8;
+          overlay.angle = 0.0;
+          overlay.type = KiiOverlayTypeByName ("circle");
+          KiiLoadOverlay (display, &overlay, 1, "blue");
+        }
 
         // pause and wait for user input: