Changeset 36342 for branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceFits.c

Timestamp:

Dec 4, 2013, 2:00:29 PM (13 years ago)

Author:

eugene

Message:

rules for performing the extended source fits and petrosian analysis are defined in psphotChooseAnalysisOptions.c; only the model-specific limits are applied here

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceFits.c (modified) (9 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceFits.c

@@ -64 +64 @@
     psLogMsg("psphot", PS_LOG_INFO, "extended source fits for image %d", index);
     psphotVisualShowImage(readout);
-
-    // psphotSaveImage (NULL, readout->image, "test.01.fits");
 
     pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
@@ -302 +300 @@
             psArrayAdd(job->args, 1, cells->data[j]); // sources
             psArrayAdd(job->args, 1, models);
+
             // Allocate a metadata iterator here because psMetadataIteratorAlloc/Free are not thread safe
             psMetadataIterator *iter = psMetadataIteratorAlloc (models, PS_LIST_HEAD, NULL);
@@ -321 +320 @@
 
 // XXX TEST 
-            if (true && !isInteractive) {
+            if (!isInteractive) {
                 if (!psThreadJobAddPending(job)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
@@ -403 +402 @@
     psphotSersicModelClassCleanup();
 
-    // psphotSaveImage (NULL, readout->image, "test.02.fits");
-
     psphotVisualShowResidualImage (readout, false);
 
@@ -458 +455 @@
         pmSource *source = sources->data[i];
 
-        // skip PSF-like and non-astronomical objects
-        if (!(source->mode & PM_SOURCE_MODE_EXT_LIMIT)) continue;
-        if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
-        if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
-
-        // skip saturated stars modeled with a radial profile 
-        if (source->mode2 & PM_SOURCE_MODE2_SATSTAR_PROFILE) continue;
-
-        // XXX this should use peak?
+        // rules for measuring petrosian parameters for specific objects are set in
+        // psphotChooseAnalysisOptions.c
+        if (!(source->tmpFlags & PM_SOURCE_TMPF_EXT_FIT)) continue;
+
+        // limit selection by analysis region (XXX move this into psphotChooseAnalysisOption?)
         if (source->peak->x < region->x0) continue;
         if (source->peak->y < region->y0) continue;
         if (source->peak->x > region->x1) continue;
         if (source->peak->y > region->y1) continue;
-
-
-        // XXX for a test, just do the obvious trail
-        // XXX if (source->peak->xf < 1100) continue;
-        // XXX if (source->peak->xf > 1400) continue;
-        // XXX if (source->peak->yf >  245) continue;
 
         // replace object in image
@@ -487 +474 @@
         psphotSetRadiusMomentsExact(&fitRadius, &windowRadius, readout, source, markVal); // NOTE : 6 allocs
 
-        // XXX WATCH OUT HERE!!
-        // fitRadius = 30;
-
         // UPDATE : we have changed the moments calculation.  There is now an iteration within 
         // psphotKronMasked to determine moments appropriate for a larger object.  The values
@@ -502 +486 @@
 # ifdef TEST_OBJECT
         bool testObject = false;
-        // testObject |= ((fabs(source->peak->xf -  179) < 5) && (fabs(source->peak->yf - 1138) < 5));
-        // testObject |= ((fabs(source->peak->xf - 5047) < 5) && (fabs(source->peak->yf -  151) < 5));
-        // testObject |= ((fabs(source->peak->xf - 3929) < 5) && (fabs(source->peak->yf - 4109) < 5));
-        // testObject |= ((fabs(source->peak->xf -  915) < 5) && (fabs(source->peak->yf - 5998) < 5));
-        // testObject |= ((fabs(source->peak->xf - 5406) < 5) && (fabs(source->peak->yf -  326) < 5));
+        testObject |= ((fabs(source->peak->xf -  179) < 5) && (fabs(source->peak->yf - 1138) < 5));
         if (testObject) {
             fprintf (stderr, "test object @ %f, %f\n", source->peak->xf, source->peak->yf);
@@ -528 +508 @@
           assert (status);
 
-          // limit selection to some SN limit
-          bool skipSource = false;
-          if (source->mode & PM_SOURCE_MODE_EXT_LIMIT) {
-              skipSource = (source->moments->KronFlux < FIT_SN_LIM * source->moments->KronFluxErr);
-          } else {
-              skipSource = (sqrt(source->peak->detValue) < FIT_SN_LIM);
-          }
-          if (skipSource) {
+          // limit selection to some SN limit for specific models (this value only applies if > EXTENDED_SOURCE_SN_LIM)
+          if (isfinite(FIT_SN_LIM)) {
+            if (source->moments->KronFlux < FIT_SN_LIM * source->moments->KronFluxErr) {
               Nfaint ++;
               continue;
+            }
           }
 
@@ -612 +588 @@
               }
           }
-          // XXX really need to do this in a cleaner way:
-          // XXX I'm not sure I can get to this statement with a null modelFit
-          if (!modelFit) continue;
+          psAssert (modelFit, "modelFit not set?");
 
           // test for fit quality / result