Changeset 16820 for trunk/psphot/src/psphotReplaceUnfit.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/psphotReplaceUnfit.c (modified) (3 diffs)

trunk/psphot/src/psphotReplaceUnfit.c

@@ -18 +18 @@
         pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
         source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
-        source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
     }
     psLogMsg ("psphot.replace", 3, "replace unfitted models: %f sec (%ld objects)\n", psTimerMark ("psphot"), sources->n);
@@ -24 +23 @@
 }
 
-bool psphotReplaceAll (psArray *sources, psMaskType maskVal) {
+bool psphotReplaceAll (psArray *sources, psMetadata *recipe) {
 
+    bool status;
     pmSource *source;
 
     psTimerStart ("psphot");
+
+    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
+    psMaskType maskVal = psMetadataLookupU8(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
+    assert (maskVal);
 
     for (int i = 0; i < sources->n; i++) {
@@ -39 +43 @@
       source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
     }
-    psLogMsg ("psphot.replace", PS_LOG_INFO, "replace models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));
+    psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));
     return true;
 }