Changeset 317

Timestamp:

Mar 30, 2004, 2:42:30 PM (22 years ago)

Author:

Paul Price

Message:

Name and comment changes.

File:

• trunk/archive/pslib/include/psFFT.h (modified) (4 diffs)

trunk/archive/pslib/include/psFFT.h

@@ -24 +24 @@
     p_psFFTDetails *details;            //!< Details on FFT implementation (private)
     int nx, ny;                         //!< Size in x and y
-    float **real;                       //!< Data in real space
+    float *real;                        //!< Data in real space: a 2D array using the [nx*y + x] stuff
     void *fourier;                      //!< Data in fourier space; implementation dependent
 } psFFT;
@@ -46 +46 @@
 /** Forward FFT: from real to fourier space */
 psFFT *
-psFFTForwardTransform(psFFT *fft        //!< FFT to apply (input and output)
-                      );
+psFFTForward(psFFT *fft                 //!< FFT to apply (input and output)
+             );
 
 /** Reverse FFT: from fourier to real space */
 psFFT *
-psFFTReverseTransform(psFFT *fft        //!< FFT to apply (input and output)
-                      );
+psFFTReverse(psFFT *fft                 //!< FFT to apply (input and output)
+             );
 
 /** Apply filter function in fourier space */
@@ -67 +67 @@
                    );
 
-/** Calculate cross-correlation function */
+/** Calculate FFT of the cross-correlation.  Multiplication of the first FFT with the complex conjugate of
+ *  the second.
+ */
 psFFT *
 psFFTCrossCorrelate(psFFT *out          //!< Output FFT (or NULL)
@@ -73 +75 @@
                     );
 
+/** Calculate FFT of the convolution.  Straight multiplication of the FFTs */
+psFFT *
+psFFTConvolve(psFFT *out,               //!< Output FFT (or NULL)
+              const psFFT *fft1, const psFFT *fft2 //!< FFTs to multiply
+              );
+
 /** Calculate power spectrum */
-psFFT *
+psFloatArray *
 psFFTPowerSpec(psFFT *fft               //!< FFT to use (input and output)
                );
-
-/** Multiply two Fourier transforms, as for convolution */
-psFFT *
-psFFTMultiplyFT(psFFT *out,             //!< Output FFT (or NULL)
-                const psFFT *fft1, const psFFT *fft2 //!< FFTs to multiply
-                );
 
 /* Convert the real data in the FFT struct to an image again */