Changeset 11762

Timestamp:

Feb 12, 2007, 5:14:42 PM (19 years ago)

Author:

Paul Price

Message:

Propagating API change in psImageStats.

Location:

trunk/psModules/src

Files:

• astrom/pmAstrometryObjects.c (modified) (5 diffs)
• objects/pmSource.c (modified) (4 diffs)
• objects/pmSourceSky.c (modified) (4 diffs)

trunk/psModules/src/astrom/pmAstrometryObjects.c

@@ -8 +8 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-07 01:31:40 $
+*  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-13 03:14:42 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -36 +36 @@
 /******************************************************************************
 pmAstromObjSortByMag(**a, **b): sort by mag (descending)
- 
+
 Is this a private routine?
 Should we do the early asserts?
@@ -454 +454 @@
 AstromGridBin(*dx, *dy, dX, dY): local function to convert x,y coords to grid
 bins it requires the globals defined above.
- 
+
  ******************************************************************************/
 static bool AstromGridBin(
@@ -567 +567 @@
         // find the max pixel
         psStats *imStats = psStatsAlloc (PS_STAT_MAX | PS_STAT_MAX | PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV);
-        imStats = psImageStats (imStats, gridNP, NULL, 0);
+        if (!psImageStats(imStats, gridNP, NULL, 0)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to get image statistics.\n");
+            psFree(imStats);
+            psFree(gridNP);
+            psFree(gridDX);
+            psFree(gridDY);
+            psFree(gridD2);
+            psFree(stats);
+            return NULL;
+        }
 
         # if 0
@@ -860 +869 @@
    +15:+25 -> 5
    +25:+35 -> 6
- 
+
    maxOffsetRequest = 30
    nPix = (int) (maxOffset / dPix + 0.5);

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 21:32:19 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-13 03:14:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -292 +292 @@
         // find the peak in this image
         stats = psStatsAlloc (PS_STAT_MAX);
-        stats = psImageStats (stats, splane, NULL, 0);
+        if (!psImageStats (stats, splane, NULL, 0)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to get image statistics.\n");
+            psFree(stats);
+            psFree(splane);
+            return emptyClump;
+        }
         peaks = pmFindImagePeaks (splane, stats[0].max / 2);
         psTrace ("psModules.objects", 2, "clump threshold is %f\n", stats[0].max/2);
@@ -544 +549 @@
 pmSource data structure, along with the peak location, and determines the
 various moments associated with that peak.
- 
+
 Requires the following to have been created:
     pmSource
@@ -551 +556 @@
     pmSource->weight
     pmSource->mask
- 
+
 XXX: The peak calculations are done in image coords, not subImage coords.
- 
+
 XXX EAM : this version clips input pixels on S/N
 XXX EAM : this version returns false for several reasons

trunk/psModules/src/objects/pmSourceSky.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-17 02:21:03 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-13 03:14:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 pmSource *pmSourceLocalSky(source, statsOptions, Radius): this
 routine creates a new pmSource.moments element if needed and sets pmSource.pmMoments.sky
- 
+
 The sky value is set from the pixels in the square annulus surrounding the
 peak pixel.
- 
+
 The source.pixels and source.mask must already exist
 *****************************************************************************/
@@ -69 +69 @@
     psImageMaskRegion(mask, srcRegion, "OR", PM_MASK_MARK);
     psStats *myStats = psStatsAlloc(statsOptions);
-    myStats = psImageStats(myStats, image, mask, 0xff);
+    if (!psImageStats(myStats, image, mask, 0xff)) {
+        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));
     double value = psStatsGetValue(myStats, statistic);
@@ -116 +120 @@
     psImageMaskRegion(mask, srcRegion, "OR", PM_MASK_MARK);
     psStats *myStats = psStatsAlloc(statsOptions);
-    myStats = psImageStats(myStats, image, mask, 0xff);
+    if (!psImageStats(myStats, image, mask, 0xff)) {
+        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));
     double value = psStatsGetValue(myStats, statistic);