Changeset 25603

Timestamp:

Sep 27, 2009, 10:45:58 AM (17 years ago)

Author:

eugene

Message:

move flagging of PM_SOURCE_TMPF_SUBTRACTED to pmSourceAdd/Sub

File:

• branches/eam_branches/20090715/psphot/src/psphotReplaceUnfit.c (modified) (5 diffs)

branches/eam_branches/20090715/psphot/src/psphotReplaceUnfit.c

@@ -17 +17 @@
     replace:
         pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
-        source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
     }
     psLogMsg ("psphot.replace", 3, "replace unfitted models: %f sec (%ld objects)\n", psTimerMark ("psphot.replace"), sources->n);
@@ -41 +40 @@
 
       pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
-      source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
     }
     psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.replace"));
@@ -64 +62 @@
       if (source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED) continue;
 
-      pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
-      source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
+      pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     }
     psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.replace"));
@@ -71 +68 @@
 }
 
+# if (0)
 // add source, if the source has been subtracted; do not modify state
 bool psphotAddWithTest (pmSource *source, bool useState, psImageMaskType maskVal) {
@@ -108 +106 @@
     return true;
 }
+# endif