Changeset 15023 for trunk/psphot/src/psphotCheckStarDistribution.c

Timestamp:

Sep 25, 2007, 1:53:33 PM (19 years ago)

Author:

eugene

Message:

adding test for field coverage of psf candidates

File:

• trunk/psphot/src/psphotCheckStarDistribution.c (modified) (5 diffs)

trunk/psphot/src/psphotCheckStarDistribution.c

@@ -3 +3 @@
 // examine the x,y distribution of the psfstars and extend the selection if needed
 // desired region and coverage are specified by pmPSFOptions
-bool psphotCheckStarDistribution (psArray *sources, pmPSFOptions *options) {
+// even if stars->n is at the limit, we will add more sources to fill out the area
+
+bool psphotCheckStarDistribution (psArray *stars, psArray *sources, pmPSFOptions *options) {
 
     // count the number of PSFSTAR sources in each cell.  for polynomial representations, we
@@ -16 +18 @@
     // set up and image and an image binning structure to cover the field
     psImage *nCell = psImageAlloc (Nx, Ny, PS_TYPE_S32);
-    psImageInit (nCell);
+    psImageInit (nCell, 0);
 
     psImageBinning *binning = psImageBinningAlloc();
@@ -27 +29 @@
     psImageBinningSetSkipByOffset (binning, options->psfFieldXo, options->psfFieldYo);
 
-    for (int i = 0; i < sources->n; i++) {
+    // where are the PSF stars located?
+    for (int i = 0; i < stars->n; i++) {
         
-        pmSource *source = sources->data[i];
-        if (source->modelEXT == NULL) continue;
+        pmSource *source = stars->data[i];
+        if (source->peak == NULL) continue;
         if (!(source->mode & PM_SOURCE_MODE_PSFSTAR)) continue;
 
-        int binX = psImageBinningGetRuffX (binning, source->modelEXT->params->data.F32[PM_PAR_XPOS]);
-        int binY = psImageBinningGetRuffX (binning, source->modelEXT->params->data.F32[PM_PAR_YPOS]);
+        int binX = psImageBinningGetRuffX (binning, source->peak->xf);
+        int binY = psImageBinningGetRuffX (binning, source->peak->yf);
 
         assert (binX >= 0);
@@ -45 +48 @@
         
     // do any cells have too few PSFSTAR sources?
+    // we use 3 as a minimum (slightly arbitrary...)
     for (int iy = 0; iy < nCell->numRows; iy++) { 
         for (int ix = 0; ix < nCell->numCols; ix++) { 
-            if (nCell->data.S32[binY][binX] < NNN) {
+            if (nCell->data.S32[iy][ix] < 3) {
+                int nNew = psphotSupplementStars (stars, sources, binning, ix, iy);
+                if (nNew) {
+                    psLogMsg ("pmObjects", 3, "added %d fainter PSF candidates to %d,%d\n", nNew, ix, iy);
+                } else {
+                    psLogMsg ("pmObjects", 3, "tried to add to %d,%d, but no more sources are available\n", ix, iy);                
+                }
             }
         }
     }
 
+    psFree (nCell);
+    psFree (binning);
+    return true;
 }
 
 // select more possible PSF stars in the specified cell
 // sources should be sorted by SN before calling this function
-bool psphotSupplementStars (psArray *sources, psImageBinning *binning, int ix, int iy) {
+int psphotSupplementStars (psArray *stars, psArray *sources, psImageBinning *binning, int ix, int iy) {
 
     int nNew = 0;
@@ -66 +79 @@
     float Ye = psImageBinningGetFineY (binning, iy + 1);
 
-    // 
     for (int i = 0; i < sources->n; i++) {
-        
+
+        // add sources which are marked as stars, in S/N order until...
         pmSource *source = sources->data[i];
-        if (source->modelEXT == NULL) continue;
-        if (!(source->mode & PM_SOURCE_MODE_PSFSTAR)) continue;
+        if (source->peak == NULL) continue;
+        if (source->moments == NULL) continue;
+        if (source->mode & PM_SOURCE_MODE_PSFSTAR) continue;
+        if (source->type != PM_SOURCE_TYPE_STAR) continue;
 
-        float x = source->modelEXT->params->data.F32[PM_PAR_XPOS];
-        float y = source->modelEXT->params->data.F32[PM_PAR_YPOS];
+        float x = source->peak->xf;
+        float y = source->peak->yf;
 
+        if (x < Xs) continue;
+        if (y < Ys) continue;
+        if (x > Xe) continue;
+        if (y > Ye) continue;
+
+        source->mode |= PM_SOURCE_MODE_PSFSTAR;
+        psArrayAdd (stars, 200, source);
+
+        nNew ++;
+    }
+    return nNew;
 }