Changeset 5802 for trunk/psphot/src/psphotReplaceUnfit.c

Timestamp:

Dec 17, 2005, 10:26:59 AM (21 years ago)

Author:

eugene

Message:

clean up of small accounting bugs, adding the post-subtraction ApResid

File:

• trunk/psphot/src/psphotReplaceUnfit.c (modified) (1 diff)

trunk/psphot/src/psphotReplaceUnfit.c

@@ -3 +3 @@
 bool psphotReplaceUnfit (psArray *sources) { 
 
-    bool status;
-    float x;
-    float y;
+    pmModel *model;
+    pmSource *source;
 
     psTimerStart ("psphot");
 
     for (int i = 0; i < sources->n; i++) {
-        pmSource *source = sources->data[i];
+      source = sources->data[i];
 
         // skip non-astronomical objects (very likely defects)
         // these were never fitted and subtracted
         if (source->mode &  PM_SOURCE_BLEND) continue;
-        if (source->type == PM_SOURCE_DEFECT) continue; 
         if (source->type == PM_SOURCE_SATURATED) continue;
+
+        if (source->type == PM_SOURCE_DEFECT) {
+            if (source->mode &  PM_SOURCE_SUBTRACTED) goto addPSF;
+            continue; 
+        }
+
+        if (source->type == PM_SOURCE_GALAXY) {
+            if (source->mode & PM_SOURCE_FAIL) goto addPSF;
+            if (source->mode & PM_SOURCE_POOR) goto addPSF;
+            continue;
+        }
 
         // need to skip the successful fits
         if (source->type == PM_SOURCE_STAR) {
-            if (source->mode & PM_SOURCE_FAIL) goto subPSF;
-            if (source->mode & PM_SOURCE_POOR) goto subPSF;
-            continue;
-
-        subPSF:
-            pmModel  *model = source->modelPSF;
-
-            x = model->params->data.F32[2];
-            y = model->params->data.F32[3];
-
-            psImageKeepCircle (source->mask, x, y, model->radius, "OR", PSPHOT_MASK_MARKED);
-            pmSourceAddModel (source->pixels, source->mask, model, false, false);
-            psImageKeepCircle (source->mask, x, y, model->radius, "AND", ~PSPHOT_MASK_MARKED);
+            if (source->mode & PM_SOURCE_FAIL) goto addPSF;
+            if (source->mode & PM_SOURCE_POOR) goto addPSF;
             continue;
         }
 
-        if (source->type == PM_SOURCE_GALAXY) {
-            if (source->mode & PM_SOURCE_FAIL) goto subFLT;
-            if (source->mode & PM_SOURCE_POOR) goto subFLT;
-            continue;
+    addPSF:
+        model = source->modelPSF;
+        if (model == NULL) continue;
 
-        subPSF:
-            pmModel  *model = source->modelFLT;
-
-            x = model->params->data.F32[2];
-            y = model->params->data.F32[3];
-
-            psImageKeepCircle (source->mask, x, y, model->radius, "OR", PSPHOT_MASK_MARKED);
-            pmSourceAddModel (source->pixels, source->mask, model, false, false);
-            psImageKeepCircle (source->mask, x, y, model->radius, "AND", ~PSPHOT_MASK_MARKED);
-            continue;
-        }
+        pmSourceAddModel (source->pixels, source->mask, model, false, false);
+        source->mode &= ~PM_SOURCE_SUBTRACTED;
     }
     psLogMsg ("psphot.replace", 4, "replace models: %f (%d objects)\n", psTimerMark ("psphot"), sources->n);