Changeset 19859

Timestamp:

Oct 2, 2008, 10:58:08 AM (18 years ago)

Author:

eugene

Message:

correctly respect useState

File:

• branches/eam_branch_20080926/psphot/src/psphotReplaceUnfit.c (modified) (3 diffs)

branches/eam_branch_20080926/psphot/src/psphotReplaceUnfit.c

@@ -71 +71 @@
 }
 
-// add source, if the source has been subtracted (or if we ignore the state)
+// add source, if the source has been subtracted; do not modify state
 bool psphotAddWithTest (pmSource *source, bool useState, psMaskType maskVal) {
 
@@ -78 +78 @@
     if (state && useState) return true;
 
-    // replace the model if 1) state says it is missing or 2) useState is false (just do it)
-    if (!state || !useState) {
-        pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
-    }
+    pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
     return true;
 }
 
-// sub source, if the source has been added (or if we ignore the state)
+// sub source, if the source has been added; do not modify state
 bool psphotSubWithTest (pmSource *source, bool useState, psMaskType maskVal) {
 
@@ -92 +89 @@
     if (state && useState) return true;
 
-    // replace the model if 1) state says it is missing or 2) useState is false (just do it)
-    if (!state || !useState) {
-        pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-    }
+    pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     return true;
 }
 
-// add or sub source replace or if the source has
+// add or sub source to match recorded state: supply current state as true (add) or false (sub)
 bool psphotSetState (pmSource *source, bool curState, psMaskType maskVal) {