Changeset 28677 for branches/eam_branches/ipp-20100621/psphot/src/psphotChoosePSF.c

Timestamp:

Jul 15, 2010, 6:31:24 AM (16 years ago)

Author:

eugene

Message:

correctly unmark unused PSF candidates using source id; grid search for sersic terms

File:

• branches/eam_branches/ipp-20100621/psphot/src/psphotChoosePSF.c (modified) (2 diffs)

branches/eam_branches/ipp-20100621/psphot/src/psphotChoosePSF.c

@@ -244 +244 @@
 
     // try each model option listed in config
+    // pmPSFtryModel makes a local copy of the sources -- those points are not the same as those for 'sources'
     for (int i = 0; i < modelNames->n; i++) {
         char *modelName = modelNames->data[i];
@@ -321 +322 @@
 
     // unset the PSFSTAR flag for stars not used for PSF model
+    // XXX a more efficient way of achieving this would be to record a pair of arrays
+    // of the source index and the source id for the psf stars.  but that would require we do
+    // not re-sort the source list in the meanwhile
+    int nDrop = 0;
     for (int i = 0; i < try->sources->n; i++) {
         pmSource *source = try->sources->data[i];
         if (try->mask->data.PS_TYPE_VECTOR_MASK_DATA[i]) {
-            source->mode &= ~PM_SOURCE_MODE_PSFSTAR;
-        }
-    }
+            // need to find this source in the original list (these are copies, not pointers)
+            for (int j = 0; j < sources->n; j++) {
+                pmSource *realSource = sources->data[j];
+                if (realSource->id != source->id) continue;
+                realSource->mode &= ~PM_SOURCE_MODE_PSFSTAR;
+                source->mode &= ~PM_SOURCE_MODE_PSFSTAR;
+                nDrop ++;
+                break;
+            }
+        }
+    }
+    // fprintf (stderr, "drop %d stars as PSF stars\n", nDrop);
+
+    // XXX is this working?
+    // int N1 = 0;
+    // for (int i = 0; i < try->sources->n; i++) {
+    //     pmSource *source = try->sources->data[i];
+    //  fprintf (stderr, "%llx : %d\n", (long long int) source, (source->mode & PM_SOURCE_MODE_PSFSTAR));
+    //  if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
+    //      N1 ++;
+    //     }
+    // }
+    // int N2 = 0;
+    // for (int i = 0; i < sources->n; i++) {
+    //     pmSource *source = sources->data[i];
+    //  fprintf (stderr, "%llx : %d\n", (long long int) source, (source->mode & PM_SOURCE_MODE_PSFSTAR));
+    //  if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
+    //      N2 ++;
+    //     }
+    // }
+    // fprintf (stderr, "N1: %d, N2: %d\n", N1, N2);
 
     // build a PSF residual image