Changeset 5828 for trunk/psphot/src/psphotFullFit.c

Timestamp:

Dec 22, 2005, 4:20:27 PM (21 years ago)

Author:

eugene

Message:

various cleanups, fixes, additions...

File:

• trunk/psphot/src/psphotFullFit.c (modified) (7 diffs)

trunk/psphot/src/psphotFullFit.c

@@ -1 +1 @@
 # include "psphot.h"
-
-# define CLEAR_TRACE \
-  if (TEST_SRC_ON) { \
-    psTraceSetLevel (".pmObjects.pmSourceFitModel", 0); \
-    psTraceSetLevel ("psMinimizeLMChi2", 0); \
-    TEST_SRC_ON = false; } \
 
 bool psphotFullFit (eamReadout *imdata, psMetadata *config, psArray *sources, pmPSF *psf, psStats *sky) 
@@ -32 +26 @@
     psphotInitRadiusFLT (config, sky, modelTypeFLT);
 
-    float TEST_SRC_X = psMetadataLookupF32 (&status, config, "TEST_SRC_X");
-    float TEST_SRC_Y = psMetadataLookupF32 (&status, config, "TEST_SRC_Y");
-    bool TEST_SRC_ON = false;
-    bool TEST_SRC    = status;
-    fprintf (stderr, "test src: %f %f\n", TEST_SRC_X, TEST_SRC_Y);
-
     for (int i = 0; i < sources->n; i++) {
 
@@ -56 +44 @@
         // replace object in image
         pmSourceAddModel (source->pixels, source->mask, modelPSF, false, false);
+        source->mode &= ~PM_SOURCE_SUBTRACTED;
 
-        psphotCheckRadiusPSF (imdata, source);
+        psphotCheckRadiusPSF (imdata, source, modelPSF);
 
         x = modelPSF->params->data.F32[2];
         y = modelPSF->params->data.F32[3];
-
-        if (TEST_SRC && (fabs(TEST_SRC_X - x) < 5) && (fabs(TEST_SRC_Y - y) < 5)) {
-            psTraceSetLevel (".pmObjects.pmSourceFitModel", 6);
-            psTraceSetLevel ("psMinimizeLMChi2", 6);
-            TEST_SRC_ON = true;
-        }
 
         // fit PSF model (set/unset the pixel mask)
@@ -78 +61 @@
 
         // does the PSF model succeed?
-        if (psphotEvalPSF (source)) {
+        if (psphotEvalPSF (source, source->modelPSF)) {
             pmSourceSubModel (source->pixels, source->mask, source->modelPSF, false, false);
-            source->mode |= PM_SOURCE_SUBTRACTED;
+            source->mode |=  PM_SOURCE_SUBTRACTED;
+            source->mode &= ~PM_SOURCE_TEMPSUB;
             psFree (LIN);
             Nsub ++;
-            CLEAR_TRACE;
             continue;
         } 
+
+        // use the moments to get the extended source angle
+        // displace on either side of the main peak by 1sigma or so
+        // cut the peak in half?  use the main peak?
+        // also try fit set on (unsaturated?) objects with a blend within 2-3 sigma
+        // allow all possible nearby blends to be fit?
+        // EllipseMoments moments;
+        // moments.x2 = source->moments->Sx;
+        // moments.y2 = source->moments->Sy;
+        // moments.xy = source->moments->Sxy;
+        // EllipseAxes axes = EllipseMomentsToAxes (moments);
 
         // skip the source if we don't think it is extended
@@ -101 +95 @@
         pmModel *modelFLT = source->modelFLT;
 
-        psphotCheckRadiusFLT (imdata, source);
+        psphotCheckRadiusFLT (imdata, source, modelFLT);
 
         x = modelFLT->params->data.F32[2];
@@ -116 +110 @@
 
         // does the FLT model succeed?
-        if (psphotEvalFLT (source)) {
+        if (psphotEvalFLT (source, source->modelFLT)) {
             pmSourceSubModel (source->pixels, source->mask, source->modelFLT, false, false);
-            source->mode |= PM_SOURCE_SUBTRACTED;
+            source->mode |=  PM_SOURCE_SUBTRACTED;
+            source->mode &= ~PM_SOURCE_TEMPSUB;
             psFree (LIN);
             Nsub ++;
-            CLEAR_TRACE;
             continue;
         }
 
-        // subtract PSF for object, leave local sky
+        // re-subtract PSF for object, leave local sky
     subLINEAR:
         psFree (source->modelPSF);
@@ -131 +125 @@
         pmSourceSubModel (source->pixels, source->mask, source->modelPSF, false, false);
         source->mode |= PM_SOURCE_SUBTRACTED;
-        source->mode |= PM_SOURCE_LINEAR;
+        source->mode |= PM_SOURCE_TEMPSUB;
         Nsub ++;
-        CLEAR_TRACE;
     }