Changeset 6481 for trunk/psphot/src/psphotBlendFit.c

Timestamp:

Feb 23, 2006, 6:16:11 PM (20 years ago)

Author:

eugene

Message:

fixed some errors with double sources, added second-pass linear PSF fit, multiple-depths

File:

• trunk/psphot/src/psphotBlendFit.c (modified) (4 diffs)

trunk/psphot/src/psphotBlendFit.c

@@ -3 +3 @@
 // XXX I don't like this name
 bool psphotBlendFit (pmReadout *readout, psMetadata *config, psArray *sources, pmPSF *psf) { 
+
+    bool status;
 
     psTimerStart ("psphot");
@@ -9 +11 @@
     sources = psArraySort (sources, psphotSortBySN);
     
+    // S/N limit to perform full non-linear fits
+    float FIT_SN_LIM = psMetadataLookupF32 (&status, config, "FULL_FIT_SN_LIM");
+
     psphotInitLimitsPSF (config);
     psphotInitLimitsEXT (config);
     psphotInitRadiusPSF (config, psf->type);
 
+    // option to limit analysis to a specific region
+    char *region = psMetadataLookupStr (&status, config, "ANALYSIS_REGION");
+    psRegion AnalysisRegion = psRegionForImage (readout->image, psRegionFromString (region));
+    if (psRegionIsNaN (AnalysisRegion)) psAbort ("psphot", "analysis region mis-defined");
+
     for (int i = 0; i < sources->n; i++) {
-
         pmSource *source = sources->data[i];
 
@@ -22 +31 @@
         if (source->type == PM_SOURCE_SATURATED) continue;
 
+        // limit selection to some SN limit
+        if (source->moments == NULL) continue;
+        if (source->moments->SN < FIT_SN_LIM) continue;
+
         // if model is NULL, we don't have a starting guess
         if (source->modelPSF == NULL) continue;
+
+        if (source->moments->x < AnalysisRegion.x0) continue;
+        if (source->moments->y < AnalysisRegion.y0) continue;
+        if (source->moments->x > AnalysisRegion.x1) continue;
+        if (source->moments->y > AnalysisRegion.y1) continue;
 
         // replace object in image
@@ -29 +47 @@
 
         psTrace ("psphot.blend", 5, "trying source at %f, %f\n", source->moments->x, source->moments->y);
-
+        
         // try fitting PSFs, then try extended sources
         if (psphotFitBlend (readout, source)) continue;