Changeset 1394 in Sophya for trunk/SophyaLib/NTools/fftservintf.cc

Timestamp:

Feb 12, 2001, 6:09:27 PM (25 years ago)

Author:

ansari

Message:

Changement interface FFTServer - Reza 12/2/2001

File:

• trunk/SophyaLib/NTools/fftservintf.cc (modified) (8 diffs)

trunk/SophyaLib/NTools/fftservintf.cc

@@ -77 +77 @@
 /* --Methode-- */
 template <class T>
-FFTArrayChecker<T>::FFTArrayChecker(bool checkpack, bool onedonly)
-{
+FFTArrayChecker<T>::FFTArrayChecker(string msg, bool checkpack, bool onedonly)
+{
+  _msg = msg + " FFTArrayChecker::";
   _checkpack = checkpack;
   _onedonly = onedonly;
@@ -89 +90 @@
 }
 
+template <class T>
+T FFTArrayChecker<T>::ZeroThreshold()
+{
+  return(0);
+}
+
+r_8 FFTArrayChecker< r_8 >::ZeroThreshold()
+{
+  return(1.e-18);
+}
+
+r_4 FFTArrayChecker< r_4 >::ZeroThreshold()
+{
+  return(1.e-9);
+}
+
+
+
 /* --Methode-- */
 template <class T>
@@ -94 +113 @@
 {
   int k;
-  if (in.Size() < 1) 
-    throw(SzMismatchError("FFTArrayChecker::CheckResize(complex in, complex out) - Unallocated input array !"));
+  string msg;
+  if (in.Size() < 1) {
+    msg = _msg + "CheckResize(complex in, complex out) - Unallocated input array !";
+    throw(SzMismatchError(msg));
+  }
   if (_checkpack) 
-    if ( !in.IsPacked() )
-      throw(SzMismatchError("FFTArrayChecker::CheckResize(complex in, complex out) - Not packed input array !"));
+    if ( !in.IsPacked() ) {
+      msg = _msg + "CheckResize(complex in, complex out) - Not packed input array !";
+      throw(SzMismatchError(msg));
+    }
   int ndg1 = 0;
   for(k=0; k<in.NbDimensions(); k++) 
     if (in.Size(k) > 1)  ndg1++;
   if (_onedonly) 
-    if (ndg1++ > 1)
-      throw(SzMismatchError("FFTArrayChecker::CheckResize(complex in, complex out) - Only 1-D array accepted !"));
-  
-  sa_size_t sz[BASEARRAY_MAXNDIMS];
-  for(k=0; k<in.NbDimensions(); k++) 
-    sz[k] = in.Size(k);
-  out.ReSize(in.NbDimensions(), sz);
+    if (ndg1 > 1) {
+      msg = _msg + "CheckResize(complex in, complex out) - Only 1-D array accepted !";
+      throw(SzMismatchError(msg));
+    }
+  out.ReSize(in);
+  //  sa_size_t sz[BASEARRAY_MAXNDIMS];
+  //  for(k=0; k<in.NbDimensions(); k++) 
+  //    sz[k] = in.Size(k);
+  //  out.ReSize(in.NbDimensions(), sz);
 
   return(ndg1);
@@ -119 +145 @@
 {
   int k;
-  if (in.Size() < 1) 
-    throw(SzMismatchError("FFTArrayChecker::CheckResize(real in, complex out) - Unallocated input array !"));
+  string msg;
+  if (in.Size() < 1) {
+    msg = _msg + "CheckResize(real in, complex out) - Unallocated input array !";
+    throw(SzMismatchError(msg));
+  }
   if (_checkpack) 
-    if ( !in.IsPacked() )
-      throw(SzMismatchError("FFTArrayChecker::CheckResize(real in, complex out) - Not packed input array !"));
+    if ( !in.IsPacked() ) {
+      msg = _msg + "CheckResize(real in, complex out) - Not packed input array !";
+      throw(SzMismatchError(msg));
+    }
   int ndg1 = 0;
   for(k=0; k<in.NbDimensions(); k++) 
     if (in.Size(k) > 1)  ndg1++;
   if (_onedonly) 
-    if (ndg1++ > 1)
-      throw(SzMismatchError("FFTArrayChecker::CheckResize(real in, complex out) - Only 1-D array accepted !"));
-  
+    if (ndg1 > 1) {
+      msg = _msg + "CheckResize(real in, complex out) - Only 1-D array accepted !";
+      throw(SzMismatchError(msg));
+    }
   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+1; 
+  //    sz[k] = (in.Size(k)%2 != 0) ? in.Size(k)/2+1 : in.Size(k)/2;
+
   out.ReSize(in.NbDimensions(), sz);
 
@@ -144 +178 @@
 {
   int k;
-  if (in.Size() < 1) 
-    throw(SzMismatchError("FFTArrayChecker::CheckResize(complex in, real out) - Unallocated input array !"));
+  string msg;
+  if (in.Size() < 1) {
+    msg = _msg + "CheckResize(complex in, real out) - Unallocated input array !";
+    throw(SzMismatchError(msg));
+  }
   if (_checkpack) 
-    if ( !in.IsPacked() )
-      throw(SzMismatchError("FFTArrayChecker::CheckResize(complex in, real out) - Not packed input array !"));
+    if ( !in.IsPacked() ) {
+      msg = _msg + "CheckResize(complex in, real out) - Not packed input array !";
+      throw(SzMismatchError(msg));
+    }
   int ndg1 = 0;
   for(k=0; k<in.NbDimensions(); k++) 
     if (in.Size(k) > 1)  ndg1++;
   if (_onedonly) 
-    if (ndg1++ > 1)
-      throw(SzMismatchError("FFTArrayChecker::CheckResize(complex in, real out) - Only 1-D array accepted !"));
-  
+    if (ndg1 > 1) {
+      msg = _msg + "CheckResize(complex in, real out) - Only 1-D array accepted !";
+      throw(SzMismatchError(msg));
+    }
   sa_size_t sz[BASEARRAY_MAXNDIMS];
-  for(k=0; k<in.NbDimensions(); k++) 
-    sz[k] = in.Size(k)*2-1;
+  if (ndg1 > 1) {
+    for(k=0; k<in.NbDimensions(); k++) 
+      sz[k] = in.Size(k)*2-1;
+  }
+  else {
+    for(k=0; k<BASEARRAY_MAXNDIMS; k++)  sz[k] = 1; 
+    T thr = ZeroThreshold();
+    sa_size_t n = in.Size(in.MaxSizeKA());
+    sa_size_t ncs = ( (in[n-1].imag() < -thr) || (in[n-1].imag() > thr) ) ?
+                    ncs = 2*n-1 : ncs = 2*n-2;
+    sz[in.MaxSizeKA()] = ncs;
+  }
+
   out.ReSize(in.NbDimensions(), sz);
 
@@ -165 +216 @@
 }
 
-/* --Methode-- */
+/* --Methode-- 
 template <class T>
 void FFTArrayChecker<T>::ReShapetoReal( TArray< complex<T> > const & in, TArray< T >  & out)
@@ -182 +233 @@
   out[ncs-2] = in[n-1].real();  out[ncs-1] = in[n-1].imag(); 
 }
-
-/* --Methode-- */
+*/
+
+/* --Methode-- 
 template <class T>
 void FFTArrayChecker<T>::ReShapetoCompl(TArray< T > const & in, TArray< complex<T> > & out)
@@ -195 +247 @@
   if (n%2 == 0) out[ncs-1] = complex<r_8>(in[n-1], 0.);
 }
-
+*/
 
 #ifdef __CXX_PRAGMA_TEMPLATES__