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

Timestamp:

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

Author:

eugene

Message:

various cleanups, fixes, additions...

File:

• trunk/psphot/src/psphotReplaceUnfit.c (modified) (2 diffs)

trunk/psphot/src/psphotReplaceUnfit.c

@@ -3 +3 @@
 bool psphotReplaceUnfit (psArray *sources) { 
 
-    pmModel *model;
     pmSource *source;
 
@@ -11 +10 @@
       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_SATURATED) continue;
+        if (!(source->mode & PM_SOURCE_TEMPSUB)) continue;
+        if (source->modelPSF == NULL) 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 addPSF;
-            if (source->mode & PM_SOURCE_POOR) goto addPSF;
-            continue;
-        }
-
-    addPSF:
-        model = source->modelPSF;
-        if (model == NULL) continue;
-
-        pmSourceAddModel (source->pixels, source->mask, model, false, false);
+        pmSourceAddModel (source->pixels, source->mask, source->modelPSF, false, false);
         source->mode &= ~PM_SOURCE_SUBTRACTED;
+        source->mode &= ~PM_SOURCE_TEMPSUB;
     }
-    psLogMsg ("psphot.replace", 4, "replace models: %f (%d objects)\n", psTimerMark ("psphot"), sources->n);
+    psLogMsg ("psphot.replace", 3, "replace unfitted models: %f sec (%d objects)\n", psTimerMark ("psphot"), sources->n);
     return true;
 }
+
+# if (0)
+if (source->mode &  PM_SOURCE_BLEND) 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 addPSF;
+    if (source->mode & PM_SOURCE_POOR) goto addPSF;
+    continue;
+}
+# endif