Changeset 17828 for trunk/psphot/src

Timestamp:

May 28, 2008, 9:00:17 AM (18 years ago)

Author:

eugene

Message:

minor name change: psphotReplaceAll to psphotReplaceAllSources (and Unfit); add psphotRemoveAllSources

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotReadout.c (modified) (3 diffs)
• psphotReplaceUnfit.c (modified) (3 diffs)

trunk/psphot/src/psphot.h

@@ -40 +40 @@
 bool            psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
 bool            psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
-bool            psphotReplaceUnfit (psArray *sources, psMaskType maskVal);
-bool            psphotReplaceAll (psArray *sources, psMetadata *recipe);
+bool            psphotReplaceUnfitSources (psArray *sources, psMaskType maskVal);
+bool            psphotReplaceAllSources (psArray *sources, psMetadata *recipe);
+bool            psphotRemoveAllSources (psArray *sources, psMetadata *recipe);
 bool            psphotApResid (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
 bool            psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf, pmReadout *background);

trunk/psphot/src/psphotReadout.c

@@ -127 +127 @@
 
     // replace all sources
-    psphotReplaceAll (sources, recipe);
+    psphotReplaceAllSources (sources, recipe);
 
     // linear fit to include all sources
@@ -165 +165 @@
 
     // replace all sources so fit below applies to all at once
-    psphotReplaceAll (sources, recipe);
+    psphotReplaceAllSources (sources, recipe);
 
     // merge the newly selected sources into the existing list
@@ -199 +199 @@
 
     // replace failed sources?
-    // psphotReplaceUnfit (sources);
+    // psphotReplaceUnfitSources (sources);
 
     // replace background in residual image

trunk/psphot/src/psphotReplaceUnfit.c

@@ -2 +2 @@
 
 // replace the flux for sources which failed
-bool psphotReplaceUnfit (psArray *sources, psMaskType maskVal) {
+bool psphotReplaceUnfitSources (psArray *sources, psMaskType maskVal) {
 
     pmSource *source;
@@ -23 +23 @@
 }
 
-bool psphotReplaceAll (psArray *sources, psMetadata *recipe) {
+bool psphotReplaceAllSources (psArray *sources, psMetadata *recipe) {
 
     bool status;
@@ -42 +42 @@
       pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
       source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
+    }
+    psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));
+    return true;
+}
+
+bool psphotRemoveAllSources (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++) {
+      source = sources->data[i];
+
+      // replace other sources?
+      if (source->mode & PM_SOURCE_MODE_SUBTRACTED) continue;
+
+      pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
+      source->mode |= PM_SOURCE_MODE_SUBTRACTED;
     }
     psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));