Changeset 2988 in Sophya for trunk/SophyaLib/NTools

Timestamp:

Jun 23, 2006, 12:30:29 PM (19 years ago)

Author:

ansari

Message:

1/ MAJ documentation/commentaire dans FFTServerInterface (fftservintf.cc)
2/ Ajout flag use_out_size d'utilisation de la taille du tableau reel de
sortie pour FFTBack(complex->real) dans ReShapetoReal() pour FFTPackServer
(fichiers fftpserver.h .cc)

Reza 23 Juin 2006

Location:

trunk/SophyaLib/NTools

Files:

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

trunk/SophyaLib/NTools/fftpserver.cc

@@ -114 +114 @@
 {
   ckR4.CheckResize(in, out, usoutsz);    
-  ReShapetoReal(in, out);
+  ReShapetoReal(in, out, usoutsz);
   fftb(out.Size(), out.Data());
 }
@@ -132 +132 @@
 {
   ckR8.CheckResize(in, out, usoutsz);  
-  ReShapetoReal(in, out);
+  ReShapetoReal(in, out, usoutsz);
   fftb(out.Size(), out.Data());
 }
@@ -138 +138 @@
 
 template <class T>
-void FFTPack_ReShapetoReal(TArray< complex<T> > const & ina, TArray< T >  & outa)
+void FFTPack_ReShapetoReal(TArray< complex<T> > const & ina, TArray< T >  & outa, bool usz)
 {
   TVector< complex<T> > in(ina);
   TVector< T > out(outa);
   sa_size_t n = in.NElts();
-  T thr = FFTArrayChecker<T>::ZeroThreshold();
-  sa_size_t ncs = ( (in(n-1).imag() < -thr) || (in(n-1).imag() > thr) )
-                  ? 2*n-1 : 2*n-2;
-
-  if (out.NElts() != ncs) {
-     cerr << "DEBUG-FFTPack_ReShapetoReal() ncs = " << ncs 
-          << " out.NElts()= " << out.NElts() << endl;
-    throw SzMismatchError("FFTPack_ReShapetoReal() - Wrong output array size !");
+  sa_size_t ncs;
+  if (usz) {
+    if ( (out.NElts() != 2*n-1) && (out.NElts() != 2*n-2) )
+      throw SzMismatchError("FFTPack_ReShapetoReal(..., true) - Wrong output array size ");
+    ncs = out.NElts();
+  }
+  else {
+    T thr = FFTArrayChecker<T>::ZeroThreshold();
+    ncs = ( (in(n-1).imag() < -thr) || (in(n-1).imag() > thr) ) ? 2*n-1 : 2*n-2;
+    
+    if (out.NElts() != ncs) {
+      cerr << "DEBUG-FFTPack_ReShapetoReal() ncs = " << ncs 
+           << " out.NElts()= " << out.NElts() << endl;
+      throw SzMismatchError("FFTPack_ReShapetoReal() - Wrong output array size !");
+    }
   }
 
@@ -187 +194 @@
 }
 
-void FFTPackServer::ReShapetoReal(TArray< complex<r_8> > const & in, TArray< r_8 >  & out)
-{
-  FFTPack_ReShapetoReal<r_8>(in, out);
+void FFTPackServer::ReShapetoReal(TArray< complex<r_8> > const & in, TArray< r_8 >  & out, 
+                                  bool usz)
+{
+  FFTPack_ReShapetoReal<r_8>(in, out, usz);
 }
 
@@ -197 +205 @@
 }
 
-void FFTPackServer::ReShapetoReal(TArray< complex<r_4> > const & in, TArray< r_4 >  & out)
-{
-  FFTPack_ReShapetoReal<r_4>(in, out);
+void FFTPackServer::ReShapetoReal(TArray< complex<r_4> > const & in, TArray< r_4 >  & out,
+                                  bool usz)
+{
+  FFTPack_ReShapetoReal<r_4>(in, out, usz);
 }
 

trunk/SophyaLib/NTools/fftpserver.h

@@ -37 +37 @@
 
 // Methodes statiques pour reordonner les donnees
-  static void ReShapetoReal(TArray< complex<r_8> > const & in, TArray< r_8 >  & out);
+  static void ReShapetoReal(TArray< complex<r_8> > const & in, TArray< r_8 >  & out, bool usz);
   static void ReShapetoCompl(TArray< r_8 > const & in, TArray< complex<r_8> > & out); 
-  static void ReShapetoReal(TArray< complex<r_4> > const & in, TArray< r_4 >  & out);
+  static void ReShapetoReal(TArray< complex<r_4> > const & in, TArray< r_4 >  & out, bool usz);
   static void ReShapetoCompl(TArray< r_4 > const & in, TArray< complex<r_4> > & out); 
 

trunk/SophyaLib/NTools/fftservintf.cc

@@ -104 +104 @@
   \param out : Output real array
   \param usoutsz : if true, use the output array size for computing the inverse FFT.
+
+  In all cases, the input/output array sizes compatibility is checked.
+  if usoutsz == false, the size of the real array is selected based on the 
+  the imaginary part of the input complex array at the nyquist frequency.
+  size_out_real = 2*size_in_complex - ( 1 or 2)   
  */
 void FFTServerInterface::FFTBackward(TArray< complex<r_8> > const &, TArray< r_8 > &, bool)
@@ -152 +157 @@
   \param out : Output real array
   \param usoutsz : if true, use the output array size for computing the inverse FFT.
- */
+
+  In all cases, the input/output array sizes compatibility is checked.
+  if usoutsz == false, the size of the real array is selected based on the 
+  the imaginary part of the input complex array at the nyquist frequency.
+  size_out_real = 2*size_in_complex - ( 1 or 2)   
+*/
 void FFTServerInterface::FFTBackward(TArray< complex<r_4> > const &, TArray< r_4 > &, bool)
 {