Index: trunk/archive/pslib/include/psFFT.h
===================================================================
--- trunk/archive/pslib/include/psFFT.h	(revision 314)
+++ trunk/archive/pslib/include/psFFT.h	(revision 317)
@@ -24,5 +24,5 @@
     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,11 +46,11 @@
 /** 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,5 +67,7 @@
 		   );
 
-/** 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,14 +75,14 @@
 		    );
 
+/** 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 */