Changeset 16820 for trunk/psphot/src/psphotSourceFits.c

Timestamp:

Mar 4, 2008, 3:10:25 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080229: better flag definitions, cleanup footprint code (move into psphotFindDetections), push mask selection into called functions

File:

• trunk/psphot/src/psphotSourceFits.c (modified) (5 diffs)

trunk/psphot/src/psphotSourceFits.c

@@ -113 +113 @@
         pmSourceSub (blend, PM_MODEL_OP_FULL, maskVal);
         blend->mode |=  PM_SOURCE_MODE_SUBTRACTED;
-        blend->mode &= ~PM_SOURCE_MODE_TEMPSUB;
     }
     NfitBlend += modelSet->n;
@@ -137 +136 @@
     pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
-    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
     return true;
 }
@@ -176 +174 @@
     pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
-    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
-
     return true;
 }
@@ -275 +271 @@
     pmSourceCacheModel (source, maskVal);
     pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
+    source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
     psTrace ("psphot", 5, "blob as EXT: %f %f\n", EXT->params->data.F32[PM_PAR_XPOS], EXT->params->data.F32[PM_PAR_YPOS]);
-
-    source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
-    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
     return true;
 
@@ -290 +284 @@
     source->mode    |= PM_SOURCE_MODE_SUBTRACTED;
     source->mode    |= PM_SOURCE_MODE_PAIR;
-    source->mode    &= ~PM_SOURCE_MODE_TEMPSUB;
 
     // copy most data from the primary source (modelEXT, blends stay NULL)