Changeset 4097 for trunk/psModules/src/pmObjects.c

Timestamp:

Jun 3, 2005, 11:43:17 AM (21 years ago)

Author:

gusciora

Message:

Worked on pmObjects.c and test functions. They should pass.

File:

• trunk/psModules/src/pmObjects.c (modified) (14 diffs)

trunk/psModules/src/pmObjects.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-25 20:28:32 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-03 21:43:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -298 +298 @@
 XXX: In the output psArray elements, should we use the image row/column offsets?
      Currently, we do not.
+ 
+XXX: Merge with CVS 1.20.  This had the proper code for images with a single
+row or column.
 *****************************************************************************/
 psArray *pmFindImagePeaks(const psImage *image,
@@ -306 +309 @@
     if ((image->numRows == 1) || (image->numCols == 1)) {
         psError(PS_ERR_UNKNOWN, true, "Currently, input image must have at least 2 rows and 2 columns.");
+        return(NULL);
     }
     psVector *tmpRow = NULL;
@@ -321 +325 @@
     for (psU32 i = 0 ; i < row1->n ; i++ ) {
         col = row1->data.U32[i];
-
         //
         // Determine if pixel (0,0) is a peak.
@@ -329 +332 @@
                     (image->data.F32[row][col] >  image->data.F32[row+1][col]) &&
                     (image->data.F32[row][col] >= image->data.F32[row+1][col+1])) {
+
                 if (image->data.F32[row][col] > threshold) {
                     list = MyListAddPeak(list, row, col, image->data.F32[row][col], PM_PEAK_EDGE);
@@ -622 +626 @@
 
     // XXX EAM : I added this code to stay on the image. So did George
-    psS32 SubImageStartRow  = PS_MAX (0, SubImageCenterRow - outerRadiusS32);
-    psS32 SubImageEndRow    = PS_MIN (image->numRows - 1, SubImageCenterRow + outerRadiusS32);
-    psS32 SubImageStartCol  = PS_MAX (0, SubImageCenterCol - outerRadiusS32);
-    psS32 SubImageEndCol    = PS_MIN (image->numCols - 1, SubImageCenterCol + outerRadiusS32);
+    psS32 SubImageStartRow  = PS_MAX(0, SubImageCenterRow - outerRadiusS32);
+    psS32 SubImageEndRow    = PS_MIN(image->numRows - 1, SubImageCenterRow + outerRadiusS32);
+    psS32 SubImageStartCol  = PS_MAX(0, SubImageCenterCol - outerRadiusS32);
+    psS32 SubImageEndCol    = PS_MIN(image->numCols - 1, SubImageCenterCol + outerRadiusS32);
     // AnulusWidth == number of pixels width in the annulus.  We add one since
     // the pixels at the inner AND outher radius are included.
@@ -670 +674 @@
     //                                      SubImageEndCol,
     //                                      SubImageEndRow);
-    psImage *subImage = NULL;
     //    printf("pmSourceLocalSky: subimage width/length is (%d, %d)\n", subImage->numCols, subImage->numRows);
+    psRegion tmpRegion = psRegionSet(SubImageStartCol,
+                                     SubImageEndCol,
+                                     SubImageStartRow,
+                                     SubImageEndRow);
+    psImage *subImage = psImageSubset((psImage *) image, tmpRegion);
+
     psImage *subImageMask = psImageAlloc(subImage->numCols,
                                          subImage->numRows,
@@ -1310 +1319 @@
         psFree(source->models);
     }
+    if (!((model == PS_MODEL_GAUSS) ||
+            (model == PS_MODEL_PGAUSS) ||
+            (model == PS_MODEL_WAUSS) ||
+            (model == PS_MODEL_TWIST_GAUSS) ||
+            (model == PS_MODEL_SERSIC) ||
+            (model == PS_MODEL_SERSIC_CORE))) {
+        psError(PS_ERR_UNKNOWN, true, "Undefined psModelType");
+        return(false);
+    }
+
     source->models = pmModelAlloc(model);
 
@@ -1873 +1892 @@
                       psVector *x)
 {
+    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(x, NAN);
     psF32 X  = x->data.F32[0] - params->data.F32[2];
     psF32 Y  = x->data.F32[1] - params->data.F32[3];
@@ -1907 +1928 @@
                             psVector *x)
 {
+    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(x, NAN);
     psF32 X  = x->data.F32[0] - params->data.F32[2];
     psF32 Y  = x->data.F32[1] - params->data.F32[3];
@@ -1945 +1968 @@
                       psVector *x)
 {
+    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(x, NAN);
     psF32 X = x->data.F32[0] - params->data.F32[2];
     psF32 Y = x->data.F32[1] - params->data.F32[2];
@@ -1991 +2016 @@
                            psVector *x)
 {
+    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(x, NAN);
     psF32 X = x->data.F32[0] - params->data.F32[2];
     psF32 Y = x->data.F32[1] - params->data.F32[3];
@@ -2047 +2074 @@
                      psVector *x)
 {
+    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(x, NAN);
     psError(PS_ERR_UNKNOWN, true, "This function is not implemented yet.");
     return(0.0);
@@ -2070 +2099 @@
                          psVector *x)
 {
+    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
+    PS_ASSERT_VECTOR_NON_NULL(x, NAN);
     psError(PS_ERR_UNKNOWN, true, "This function is not implemented yet.");
     return(0.0);