Changeset 13900 for trunk/psphot/src/psphotSourceStats.c

Timestamp:

Jun 19, 2007, 4:40:44 PM (19 years ago)

Author:

Paul Price

Message:

Extensive changes to APIs to allow use of a nominated value to mask
against (the maskVal). Previously, the mask values were either
hard-coded (e.g., PM_MASK_SAT) or taken as anything non-zero. The
code is tested with psModules (which has similar changes) and does not
crash, but neither is it successful in marking all bad pixels. For
this reason, I have left the "gutter" pixels (cell gaps) set to 0
instead of NAN in pmFPAMosaic.

File:

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

trunk/psphot/src/psphotSourceStats.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-psArray *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *peaks)
+psArray *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *peaks, psMaskType maskVal, psMaskType mark)
 {
     bool     status  = false;
@@ -40 +40 @@
 
         // skip faint sources
-        if (source->peak->SN < MIN_SN) {
+        if (source->peak->SN < MIN_SN) {
             psArrayAdd (sources, 100, source);
             psFree (source);
-            continue;
-        }
+            continue;
+        }
 
         // measure a local sky value
         // XXX EAM : this should use ROBUST not SAMPLE median, but it is broken
-        status = pmSourceLocalSky (source, PS_STAT_SAMPLE_MEDIAN, INNER);
+        status = pmSourceLocalSky (source, PS_STAT_SAMPLE_MEDIAN, INNER, maskVal, mark);
         if (!status) {
           psFree (source);
-          Nfail ++;
+          Nfail ++;
           continue;
         }
@@ -57 +57 @@
         // measure the local sky variance (needed if noise is not sqrt(signal))
         // XXX EAM : this should use ROBUST not SAMPLE median, but it is broken
-        status = pmSourceLocalSkyVariance (source, PS_STAT_SAMPLE_MEDIAN, INNER);
+        status = pmSourceLocalSkyVariance (source, PS_STAT_SAMPLE_MEDIAN, INNER, maskVal, mark);
         if (!status) {
           psFree (source);
-          Nfail ++;
+          Nfail ++;
           continue;
         }
@@ -70 +70 @@
             psArrayAdd (sources, 100, source);
             psFree (source);
-            Nmoments ++;
+            Nmoments ++;
             continue;
         }
@@ -83 +83 @@
             psArrayAdd (sources, 100, source);
             psFree (source);
-            Nmoments ++;
+            Nmoments ++;
             continue;
         }
 
         psFree (source);
-        Nfail ++;
+        Nfail ++;
         continue;
     }