Changeset 12627

Timestamp:

Mar 28, 2007, 9:03:59 AM (19 years ago)

Author:

eugene

Message:

adding source plots and radial plots

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (1 diff)
• psphotRadialPlot.c (added)
• psphotSourcePlots.c (modified) (3 diffs)
• psphotSummaryPlots.c (modified) (1 diff)

trunk/psphot/src/Makefile.am

@@ -49 +49 @@
         psphotMergeSources.c     \
         psphotReadoutCleanup.c   \
+        psphotAddNoise.c         \
+        psphotSourcePlots.c      \
+        psphotRadialPlot.c       \
         psphotCleanup.c         
 

trunk/psphot/src/psphot.h

@@ -103 +103 @@
 psExit psphotGetExitStatus ();
 bool psphotSetHeaderNstars (psMetadata *recipe, psArray *sources);
+bool psphotAddNoise (pmReadout *readout, psArray *sources, psMetadata *recipe, bool add);
+bool psphotRadialPlot (const char *filename, pmSource *source);
+bool psphotSourcePlots (pmReadout *readout, psArray *sources, psMetadata *recipe);

trunk/psphot/src/psphotSourcePlots.c

@@ -10 +10 @@
     PS_ASSERT (status);
 
-    int NX = 10*(2*OUTER+1);
-    int NY = 0;
-
     // examine PSF sources in S/N order (brightest first)
     sources = psArraySort (sources, psphotSortBySN);
 
-    bool newRow = true;
+    // counters to track the size of the image and area used in a row
+    int dX = 0;                         // starting corner of next box
+    int dY = 0;                         // height of row so far
+    int NX = 10*(2*OUTER+1);            // full width of output image
+    int NY = 0;                         // total height of output image
 
     // first, examine the PSF and SAT stars:
@@ -30 +31 @@
         if (!keep) continue;
 
-        if (newRow) {
-            dX = 0;
-            dY = 0;
-            newRow = false;
+        // how does this subimage get placed into the output image?
+        if (dX + source->pixels->numCols >= NX) {
+            // too wide for the rest of this row
+            if (dX == 0) {
+                // alone on this row
+                NY += source->pixels->numRows;
+                dX = 0;
+                dY = 0;
+            } else {
+                // start the next row
+                NY += dY;
+                dX = source->pixels->numCols;
+                dY = source->pixels->numRows;
+            }
+        } else {
+            // extend this row
+            dX += source->pixels->numCols;
+            dY = PS_MAX (dY, source->pixels->numRows);
         }
-
-        if (dX + source->pixels->numCols > NX) {
-            // go to the next row
-            // but, if we have only this one entry, we will truncate it.
-        }
-        dX += source->pixels->numCols;
-        dY = PS_MAX (dY, source->pixels->numRows);
-
-        // for a new row:
-        NY += dY;
-
-        RadialPlot (source);
+        psphotRadialPlot ("radial.plots.ps", source);
     }
 
     // allocate output image
-    psImage *output = psImageAlloc (NX, NY, PS_TYPE_F32);
+    psImage *outpos = psImageAlloc (NX, NY, PS_TYPE_F32);
+    psImage *outsub = psImageAlloc (NX, NY, PS_TYPE_F32);
+
+    int Xo = 0;                         // starting corner of next box
+    int Yo = 0;                         // starting corner of next box
+    int dY = 0;                         // height of row so far
 
     // first, examine the PSF and SAT stars:
@@ -64 +73 @@
         if (!keep) continue;
 
-        // add to image
+        // how does this subimage get placed into the output image?
+        if (Xo + source->pixels->numCols >= NX) {
+            // too wide for the rest of this row
+            if (Xo == 0) {
+                // alone on this row
+                PlaceImage (source, Xo, Yo);
+                Yo += source->pixels->numRows;
+                Xo = 0;
+                dY = 0;
+            } else {
+                // start the next row
+                Yo += dY;
+                Xo = 0;
+                PlaceImage (source, Xo, Yo);
+                Xo = source->pixels->numCols;
+                dY = source->pixels->numRows;
+            }
+        } else {
+            // extend this row
+            PlaceImage (source, Xo, Yo);
+            Xo += source->pixels->numCols;
+            dY = PS_MAX (dY, source->pixels->numRows);
+        }
     }
 
     psLogMsg ("psphot", PS_LOG_INFO, "%ld sources, %d moments, %d failed: %f sec\n", sources->n, Nmoments, Nfail, psTimerMark ("psphot"));
-
     return (sources);
 }
 
-// XXX EAM : filter out bad peaks (eg, no valid pixels available for sky)

trunk/psphot/src/psphotSummaryPlots.c

@@ -33 +33 @@
         return false;
     }
-
 
     KapaResize (kapa, 500, 500);