Changeset 5607 for trunk/psphot/src/pmObjects_EAM.c

Timestamp:

Nov 25, 2005, 5:00:41 PM (20 years ago)

Author:

eugene

Message:

updating to work with current psModules

File:

• trunk/psphot/src/pmObjects_EAM.c (modified) (7 diffs)

trunk/psphot/src/pmObjects_EAM.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-25 23:13:43 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-26 03:00:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -723 +723 @@
     for (psS32 row = 0; row < source->pixels->numRows ; row++) {
         for (psS32 col = 0; col < source->pixels->numCols ; col++) {
-            if ((source->mask != NULL) && (source->mask->data.U8[row][col])) continue;
+            if ((source->mask != NULL) && (source->mask->data.U8[row][col])) {
+                continue;
+            }
 
             psF32 xDiff = col + source->pixels->col0 - xPeak;
@@ -730 +732 @@
             // XXX EAM : calculate xDiff, yDiff up front;
             //           radius is just a function of (xDiff, yDiff)
-            if (!VALID_RADIUS(xDiff, yDiff, R2)) continue;
+            if (!VALID_RADIUS(xDiff, yDiff, R2)) {
+                continue;
+            }
 
             psF32 pDiff = source->pixels->data.F32[row][col] - sky;
@@ -736 +740 @@
             // XXX EAM : check for valid S/N in pixel
             // XXX EAM : should this limit be user-defined?
-            if (pDiff / sqrt(source->weight->data.F32[row][col]) < 1) continue;
+            if (pDiff / sqrt(source->weight->data.F32[row][col]) < 1) {
+                continue;
+            }
             
             Sum += pDiff;
@@ -1031 +1037 @@
 
         // XXX EAM : can we use the value of SATURATE if mask is NULL?
-        // allArray = psRegionSet (0, 0, 0, 0);
         int Nsatpix = psImageCountPixelMask (tmpSrc->mask, allArray, PSPHOT_MASK_SATURATED);
 
@@ -1670 +1675 @@
         }
     } 
-    # if (0)
-    else {
-        // try keeping the moments sky -- unsuccessful
-        for (int i = 1; i < paramMask->n; i++) {
-            paramMask->data.U8[i] = 0;
-        }
-        paramMask->data.U8[0] = 1;
-    }
-    # endif
 
 
@@ -1814 +1810 @@
     return(p_pmSourceAddOrSubModel(image, mask, model, center, 1));
 }
-
-
-// XXX: Put this is psConstants.h
-#define PS_VECTOR_CHECK_SIZE(VEC1, N, RVAL) \
-if (VEC1->n != N) { \
-    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
-            "psVector %s has size %d, should be %d.", \
-            #VEC1, VEC1->n, N); \
-    return(RVAL); \
-}