Changeset 831 for trunk/psLib/src/dataManip/psVectorFFT.c

Timestamp:

Jun 2, 2004, 1:29:39 PM (22 years ago)

Author:

harman

Message:

Changed psVector to be consistent with psImage

File:

• trunk/psLib/src/dataManip/psVectorFFT.c (modified) (11 diffs)

trunk/psLib/src/dataManip/psVectorFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 03:02:48 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-02 23:29:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -448 +448 @@
     numElements = in->n;
 
-    out = psVectorRecycle(out,PS_TYPE_C32,numElements);
+    out = psVectorRecycle(out, numElements, PS_TYPE_C32);
 
     if (type == PS_TYPE_F32) {
         // need to convert to complex
-        psC32* outVec = out->vec.cf;
-        psF32* inVec = in->vec.f;
+        psC32* outVec = out->data.C32;
+        psF32* inVec = in->data.F32;
         for (unsigned int i=0;i<numElements;i++) {
             outVec[i] = inVec[i];
         }
     } else {
-        psC32* outVec = out->vec.cf;
-        psC32* inVec = in->vec.cf;
+        psC32* outVec = out->data.C32;
+        psC32* inVec = in->data.C32;
         for (unsigned int i=0;i<numElements;i++) {
             outVec[i] = inVec[i];
@@ -466 +466 @@
 
     plan = fftwf_plan_dft_1d(numElements,
-                             (fftwf_complex*)out->vec.cf,
-                             (fftwf_complex*)out->vec.cf,
+                             (fftwf_complex*)out->data.C32,
+                             (fftwf_complex*)out->data.C32,
                              direction,
                              P_FFTW_PLAN_RIGOR);
@@ -504 +504 @@
         psLogMsg(__func__,PS_LOG_WARN,"Real portion of a non-Complex type called called for. "
                  "Just a vector copy was performed.");
-        out = psVectorRecycle(out,type,numElements);
-        memcpy(out->vec.v,in->vec.v,numElements*PSELEMTYPE_SIZEOF(type));
+        out = psVectorRecycle(out,numElements,type);
+        memcpy(out->data.V,in->data.V,numElements*PSELEMTYPE_SIZEOF(type));
         return out;
     }
@@ -511 +511 @@
     if (type == PS_TYPE_C32) {
         psF32* outVec;
-        psC32* inVec = in->vec.cf;
-
-        out = psVectorRecycle(out,PS_TYPE_F32,numElements);
-        outVec = out->vec.f;
+        psC32* inVec = in->data.C32;
+
+        out = psVectorRecycle(out,numElements,PS_TYPE_F32);
+        outVec = out->data.F32;
 
         for (unsigned int i=0;i<numElements;i++) {
@@ -548 +548 @@
                  "A zeroed vector was returned.");
         out = psVectorRecycle(out,numElements,type);
-        memset(out->vec.v,0,PSELEMTYPE_SIZEOF(type)*numElements);
+        memset(out->data.V,0,PSELEMTYPE_SIZEOF(type)*numElements);
         return out;
     }
@@ -554 +554 @@
     if (type == PS_TYPE_C32) {
         psF32* outVec;
-        psC32* inVec = in->vec.cf;
-
-        out = psVectorRecycle(out,PS_TYPE_F32,numElements);
-        outVec = out->vec.f;
+        psC32* inVec = in->data.C32;
+
+        out = psVectorRecycle(out,numElements, PS_TYPE_F32);
+        outVec = out->data.F32;
 
         for (unsigned int i=0;i<numElements;i++) {
@@ -601 +601 @@
     if (type == PS_TYPE_F32) {
         psC32* outVec;
-        psF32* realVec = real->vec.f;
-        psF32* imagVec = imag->vec.f;
-
-        out = psVectorRecycle(out,PS_TYPE_C32,numElements);
-        outVec = out->vec.cf;
+        psF32* realVec = real->data.F32;
+        psF32* imagVec = imag->data.F32;
+
+        out = psVectorRecycle(out,numElements, PS_TYPE_C32);
+        outVec = out->data.C32;
 
         for (unsigned int i=0;i<numElements;i++) {
@@ -639 +639 @@
                  "Vector copy was performed instead.");
 
-        out = psVectorRecycle(out,type,numElements);
-        memcpy(out->vec.v,in->vec.v,PSELEMTYPE_SIZEOF(type)*numElements);
+        out = psVectorRecycle(out,numElements,type);
+        memcpy(out->data.V,in->data.V,PSELEMTYPE_SIZEOF(type)*numElements);
         return out;
     }
@@ -646 +646 @@
     if (type == PS_TYPE_C32) {
         psC32* outVec;
-        psC32* inVec = in->vec.cf;
-
-        out = psVectorRecycle(out,PS_TYPE_C32,numElements);
-        outVec = out->vec.cf;
+        psC32* inVec = in->data.C32;
+
+        out = psVectorRecycle(out,numElements,PS_TYPE_C32);
+        outVec = out->data.C32;
 
         for (unsigned int i=0;i<numElements;i++) {
@@ -686 +686 @@
     if (type == PS_TYPE_C32) {
         psF32* outVec;
-        psC32* inVec = in->vec.cf;
+        psC32* inVec = in->data.C32;
         psF32 real;
         psF32 imag;
 
 
-        out = psVectorRecycle(out,PS_TYPE_F32,numElements);
-        outVec = out->vec.f;
+        out = psVectorRecycle(out,numElements,PS_TYPE_F32);
+        outVec = out->data.F32;
 
         for (unsigned int i=0;i<numElements;i++) {