Changeset 1400 in Sophya

Timestamp:

Feb 13, 2001, 3:29:38 PM (25 years ago)

Author:

ansari

Message:

Modifs-debug FFTServerInterface FFTPackServer - Reza 13/2/2001

Location:

trunk/SophyaLib/NTools

Files:

• fftpserver.cc (modified) (2 diffs)
• fftservintf.cc (modified) (2 diffs)
• fftservintf.h (modified) (1 diff)

trunk/SophyaLib/NTools/fftpserver.cc

@@ -132 +132 @@
                     ncs = 2*n-1 : ncs = 2*n-2;
 
-  if (out.NElts() != ncs) 
+  if (out.NElts() != ncs) {
+     cerr << "DEBUG-FFTPack_ReShapetoReal() ncs = " << ncs 
+          << " out.NElts()= " << out.NElts() << endl;
     throw SzMismatchError("FFTPack_ReShapetoReal() - Wrong output array size !");
-    //    cerr << "DEBUG-FFTPack_ReShapetoReal() ncs = " << ncs 
-    //   << " out.NElts()= " << out.NElts() << endl;
+  }
 
   sa_size_t k;
@@ -158 +159 @@
   sa_size_t ncs = n/2+1;
   sa_size_t nc = (n%2 != 0) ? n/2+1 : n/2;
-  if (out.NElts() != ncs)
+  if (out.NElts() != ncs) {
+    cerr << "DBG-ReShapetoCompl() ncs=" << ncs 
+         << " out.NElts()= " << out.NElts() << endl;
     throw SzMismatchError("FFTPack_ReShapetoCompl() - Wrong output array size !");
-
+  }
   out(0) = complex<T> (in(0),0.);
   for(int k=1;k<nc;k++)

trunk/SophyaLib/NTools/fftservintf.cc

@@ -164 +164 @@
     }
   sa_size_t sz[BASEARRAY_MAXNDIMS];
-  for(k=0; k<in.NbDimensions(); k++) 
-    sz[k] = in.Size(k)/2+1; 
-  //    sz[k] = (in.Size(k)%2 != 0) ? in.Size(k)/2+1 : in.Size(k)/2;
-
+  // 
+  if (ndg1 > 1) {
+    sz[0] = in.Size(0)/2+1; 
+    for(k=1; k<in.NbDimensions(); k++) 
+      sz[k] = in.Size(k); 
+  }
+  else {
+    for(k=0; k<BASEARRAY_MAXNDIMS; k++)  sz[k] = 1; 
+    sz[in.MaxSizeKA()] = in.Size(in.MaxSizeKA())/2+1;
+    //    sz[k] = in.Size(k)/2+1; 
+    //    sz[k] = (in.Size(k)%2 != 0) ? in.Size(k)/2+1 : in.Size(k)/2;
+  }
   out.ReSize(in.NbDimensions(), sz);
 
@@ -198 +206 @@
   sa_size_t sz[BASEARRAY_MAXNDIMS];
   if (ndg1 > 1) {
-    for(k=0; k<in.NbDimensions(); k++) 
-      sz[k] = in.Size(k)*2-1;
+    sz[0] = 2*in.Size(0)-1;
+    for(k=1; k<in.NbDimensions(); k++) 
+      sz[k] = in.Size(k);
+    //      sz[k] = in.Size(k)*2-1;
   }
   else {

trunk/SophyaLib/NTools/fftservintf.h

@@ -54 +54 @@
 class FFTArrayChecker {
 public:
-                FFTArrayChecker(string msg, bool checkpack=true, bool onedonly=false);
+                FFTArrayChecker(string msg, bool checkpack=true, 
+                                bool onedonly=false);
   virtual       ~FFTArrayChecker();
   static T      ZeroThreshold();