Changeset 7769

Timestamp:

Jun 30, 2006, 1:59:49 PM (20 years ago)

Author:

magnier

Message:

replaced PS_IMAGE_SET and PS_VECTOR_SET with psImageInit, psVectorInit

Location:

trunk/psModules/src

Files:

• detrend/pmSubtractSky.c (modified) (4 diffs)
• imcombine/pmImageCombine.c (modified) (7 diffs)
• imcombine/pmImageSubtract.c (modified) (7 diffs)

trunk/psModules/src/detrend/pmSubtractSky.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 23:59:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -347 +347 @@
     // Initialize A matrix and B vector.
     //
-    PS_IMAGE_SET_F64(A, 0.0);
-    PS_VECTOR_SET_F64(B, 0.0);
+    psImageInit(A, 0.0);
+    psVectorInit(B, 0.0);
 
     //
@@ -577 +577 @@
                                            binnedImage->numRows,
                                            PS_TYPE_U8);
-            PS_IMAGE_SET_U8(binnedMaskImage, 0);
+            psImageInit(binnedMaskImage, 0);
         }
     } else {
@@ -588 +588 @@
                                        binnedImage->numRows,
                                        PS_TYPE_U8);
-        PS_IMAGE_SET_U8(binnedMaskImage, 0);
+        psImageInit(binnedMaskImage, 0);
     }
     psTrace(".psModule.pmSubtractSky", 4,

trunk/psModules/src/imcombine/pmImageCombine.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-04 01:01:33 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 23:59:49 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -103 +103 @@
         combine = psImageAlloc(numCols, numRows, PS_TYPE_F32);
         if (pixels != NULL) {
-            PS_IMAGE_SET_F32(combine, 0.0);
+            psImageInit(combine, 0.0);
         }
     }
@@ -127 +127 @@
     //
     psVector *qpPtr = psVectorAlloc(numImages, PS_TYPE_S32);
-    PS_VECTOR_SET_S32(qpPtr, 0);
+    psVectorInit(qpPtr, 0);
     qpPtr->n = numImages;
     //
@@ -139 +139 @@
     if (masks != NULL) {
         pixelMask = psVectorAlloc(numImages, PS_TYPE_U8);
-        PS_VECTOR_SET_U8(pixelMask, 0);
+        psVectorInit(pixelMask, 0);
         pixelMask->n = numImages;
     }
@@ -146 +146 @@
     if (errors != NULL) {
         pixelErrors = psVectorAlloc(numImages, PS_TYPE_F32);
-        PS_VECTOR_SET_F32(pixelErrors, 1.0);
+        psVectorInit(pixelErrors, 1.0);
         pixelErrors->n = numImages;
     }
@@ -157 +157 @@
         for (psS32 p = 0 ; p < pixels->n ; p++) {
             // Must initialize the mask to 0 for every pixel.
-            PS_VECTOR_SET_U8(pixelMask, 0);
+            psVectorInit(pixelMask, 0);
             psS32 col = (pixels->data[p]).x;
             psS32 row = (pixels->data[p]).y;
@@ -553 +553 @@
     //
     psVector *rPtr = psVectorAlloc(numImages, PS_TYPE_S32);
-    PS_VECTOR_SET_S32(rPtr, 0);
+    psVectorInit(rPtr, 0);
     rPtr->n = numImages;
 

trunk/psModules/src/imcombine/pmImageSubtract.c

@@ -7 +7 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 23:59:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -253 +253 @@
 
                     psImage *currPreCalc = psImageAlloc(1 + (2 * size), 1 + (2 * size), PS_TYPE_F32);
-                    PS_IMAGE_SET_F32(currPreCalc, 0.0);
+                    psImageInit(currPreCalc, 0.0);
                     psBool setPreCalc = true;
                     //
@@ -818 +818 @@
                 PS_ASSERT_IMAGE_SIZE(stampMatrix, numSolveParams, numSolveParams, false);
             }
-            PS_IMAGE_SET_F64(stampMatrix, 0.0);
+            psImageInit(stampMatrix, 0.0);
 
             if (stampVector == NULL) {
@@ -828 +828 @@
                 PS_ASSERT_VECTOR_SIZE(stampVector, numSolveParams, false);
             }
-            PS_VECTOR_SET_F64(stampVector, 0.0);
+            psVectorInit(stampVector, 0.0);
             psTrace("pmSubtractionCalculateEquation", 6, "subCalcEqn(): stamp %d: allocate matrix and vector.\n", s);
 
@@ -1054 +1054 @@
     psVector *sumVector = psVectorAlloc(size, PS_TYPE_F64);
     sumVector->n = sumVector->nalloc;
-    PS_VECTOR_SET_F64(sumVector, 0.0);
-    PS_IMAGE_SET_F64(sumMatrix, 0.0);
+    psVectorInit(sumVector, 0.0);
+    psImageInit(sumMatrix, 0.0);
 
     //
@@ -1148 +1148 @@
         deviations->n = deviations->nalloc;
         // XXX: Probably not necessary.
-        PS_VECTOR_SET_F32(deviations, 0.0);
+        psVectorInit(deviations, 0.0);
     }
     PS_ASSERT_IMAGE_NON_NULL(refImage, NULL);
@@ -1359 +1359 @@
         out = psImageAlloc(1+2*kernelSize, 1+2*kernelSize, PS_TYPE_F32);
     }
-    PS_IMAGE_SET_F32(out, 0.0);
+    psImageInit(out, 0.0);
 
     //