Changeset 13898 for trunk/psModules/src/objects/pmSourceSky.c

Timestamp:

Jun 19, 2007, 4:22:26 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 under psphot (which has similar changes) and does not
crash, but neither is it successful in marking all bad pixels (EAM
will investigate). For this reason, I have left the "gutter" pixels
(cell gaps) set to 0 instead of NAN in pmFPAMosaic.

File:

• trunk/psModules/src/objects/pmSourceSky.c (modified) (5 diffs)

trunk/psModules/src/objects/pmSourceSky.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-26 01:20:29 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-20 02:22:26 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
     pmSource *source,
     psStatsOptions statsOptions,
-    psF32 Radius)
+    psF32 Radius,
+    psMaskType maskVal,
+    psMaskType mark)
 {
     psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
@@ -68 +70 @@
     srcRegion = psRegionForImage(mask, srcRegion);
 
-    psImageMaskRegion(mask, srcRegion, "OR", PM_MASK_MARK);
+    psImageMaskRegion(mask, srcRegion, "OR", mark);
     psStats *myStats = psStatsAlloc(statsOptions);
-    if (!psImageStats(myStats, image, mask, 0xff)) {
+    if (!psImageStats(myStats, image, mask, maskVal | mark)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to get image statistics.\n");
         psFree(myStats);
         return false;
     }
-    psImageMaskRegion(mask, srcRegion, "AND", PS_NOT_U8(PM_MASK_MARK));
+    psImageMaskRegion(mask, srcRegion, "AND", PS_NOT_U8(mark));
     double value = psStatsGetValue(myStats, statistic);
     psFree(myStats);
@@ -95 +97 @@
     pmSource *source,
     psStatsOptions statsOptions,
-    psF32 Radius)
+    psF32 Radius,
+    psMaskType maskVal,
+    psMaskType mark
+)
 {
     psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
@@ -119 +124 @@
     srcRegion = psRegionForImage(mask, srcRegion);
 
-    psImageMaskRegion(mask, srcRegion, "OR", PM_MASK_MARK);
+    psImageMaskRegion(mask, srcRegion, "OR", mark);
     psStats *myStats = psStatsAlloc(statsOptions);
-    if (!psImageStats(myStats, image, mask, 0xff)) {
+    if (!psImageStats(myStats, image, mask, maskVal | mark)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to get image statistics.\n");
         psFree(myStats);
         return false;
     }
-    psImageMaskRegion(mask, srcRegion, "AND", PS_NOT_U8(PM_MASK_MARK));
+    psImageMaskRegion(mask, srcRegion, "AND", PS_NOT_U8(mark));
     double value = psStatsGetValue(myStats, statistic);
     psFree(myStats);