Changeset 4954 for trunk/psphot/src/psModulesUtils.c

Timestamp:

Sep 6, 2005, 5:33:01 PM (21 years ago)

Author:

eugene

Message:

psphot reorganization: merged in pmObjects code from psModule, modified to work with psLib 0.7.0

File:

• trunk/psphot/src/psModulesUtils.c (modified) (4 diffs)

trunk/psphot/src/psModulesUtils.c

@@ -11 +11 @@
     psImage *image = source->pixels;
     psImage *mask  = source->mask;
-    psPeak *peak  = source->peak;
-    psRegion *srcRegion;
-
-    srcRegion = psRegionSquare (peak->x, peak->y, Radius);
-    srcRegion = psRegionForImage (srcRegion, mask, srcRegion);
-    psImageMaskRegion (mask, srcRegion, OR, 0x80);
-
+    pmPeak *peak  = source->peak;
+    psRegion srcRegion;
+
+    // XXX EAM : psRegionXXX funcs need value not ptr
+
+    srcRegion = psRegionForSquare (peak->x, peak->y, Radius);
+    srcRegion = psRegionForImage (mask, &srcRegion);
+
+    psImageMaskRegion (mask, &srcRegion, "OR", PSPHOT_MASK_MARKED);
     psStats *myStats = psStatsAlloc(statsOptions);
     myStats = psImageStats(myStats, image, mask, 0xff);
-    psImageMaskRegion (mask, srcRegion, AND, 0x7f);
+    psImageMaskRegion (mask, &srcRegion, "AND", ~PSPHOT_MASK_MARKED);
 
     psF64 tmpF64;
     p_psGetStatValue(myStats, &tmpF64);
-
     psFree (myStats);
-    psFree (srcRegion);
 
     if (isnan(tmpF64)) return (false);
@@ -40 +40 @@
                              const bool PSF)
 {
-    PS_PTR_CHECK_NULL(source, false);
-    PS_PTR_CHECK_NULL(source->moments, false);
-    PS_PTR_CHECK_NULL(source->peak, false);
-    PS_PTR_CHECK_NULL(source->pixels, false);
-    PS_PTR_CHECK_NULL(source->mask, false);
-    PS_PTR_CHECK_NULL(source->noise, false);
+    // PS_PTR_CHECK_NULL(source, false);
+    // PS_PTR_CHECK_NULL(source->moments, false);
+    // PS_PTR_CHECK_NULL(source->peak, false);
+    // PS_PTR_CHECK_NULL(source->pixels, false);
+    // PS_PTR_CHECK_NULL(source->mask, false);
+    // PS_PTR_CHECK_NULL(source->noise, false);
     psBool fitStatus = true;
     psBool onPic     = true;
@@ -188 +188 @@
  
 XXX: mask values?
+
+XXX EAM : this version clips input pixels on S/N
 *****************************************************************************/
 # define VALID_RADIUS(X,Y) (((R2) >= (PS_SQR(X) + PS_SQR(Y))) ? 1 : 0)
@@ -194 +196 @@
                          psF32 radius)
 {
-    PS_PTR_CHECK_NULL(source, NULL);
-    PS_PTR_CHECK_NULL(source->peak, NULL);
-    PS_PTR_CHECK_NULL(source->pixels, NULL);
-    PS_PTR_CHECK_NULL(source->noise, NULL);
+    // PS_PTR_CHECK_NULL(source, NULL);
+    // PS_PTR_CHECK_NULL(source->peak, NULL);
+    // PS_PTR_CHECK_NULL(source->pixels, NULL);
+    // PS_PTR_CHECK_NULL(source->noise, NULL);
     PS_FLOAT_COMPARE(0.0, radius, NULL);