Index: trunk/psLib/test/fft/Makefile.am
===================================================================
--- trunk/psLib/test/fft/Makefile.am	(revision 12154)
+++ trunk/psLib/test/fft/Makefile.am	(revision 12155)
@@ -12,7 +12,5 @@
 
 TEST_PROGS = \
-	tap_psImageFFT \
 	tap_psImageFFT2 \
-	tap_psVectorFFT \
 	tap_psVectorFFT2
 
Index: trunk/psLib/test/fft/tap_psImageFFT2.c
===================================================================
--- trunk/psLib/test/fft/tap_psImageFFT2.c	(revision 12154)
+++ 	(revision )
@@ -1,74 +1,0 @@
-#include <stdio.h>
-#include <math.h>
-#include <pslib.h>
-
-#include "tap.h"
-#include "pstap.h"
-
-#define TOL 2.0e-6                      // Tolerance for comparison
-
-
-// Generate image with single high pixel
-static psImage *generateImage(int numCols, int numRows)
-{
-    psImage *image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-    for (int y = 0; y < numRows; y++) {
-        for (int x = 0; x < numCols; x++) {
-            image->data.F32[y][x] = 1.2 * cos(2.0 * M_PI * x / numCols + M_PI / 4.0) +
-                3.4 * sin(2.0 * M_PI * y / numRows + M_PI);
-        }
-    }
-    return image;
-}
-
-// FFT forward, then back --- do I get what I started with?
-// A total of 6 tests here.
-static void testFFT(int numCols, int numRows)
-{
-    psMemId id = psMemGetId();
-
-    diag("Testing %dx%d", numCols, numRows);
-    psImage *old = generateImage(numCols, numRows);
-    psImage *fftReal = NULL, *fftImag = NULL;
-    bool result = psImageForwardFFT(&fftReal, &fftImag, old);
-    ok(result, "forward fft result");
-    skip_start(!result || !fftReal || !fftImag, 3, "forward fft failed");
-    ok(fftReal->type.type == PS_TYPE_F32 && fftImag->type.type == PS_TYPE_F32, "forward fft types");
-    psImage *new = NULL;
-    result = psImageBackwardFFT(&new, fftReal, fftImag, old->numCols);
-    ok(result, "backward fft result");
-    skip_start(!result || !new, 2, "backward fft failed");
-    ok(new->type.type == PS_TYPE_F32, "backward fft type");
-    float maxDev = 0.0;                 // Maximum deviation from expected
-    for (int y = 0; y < old->numRows; y++) {
-        for (int x = 0; x < old->numCols; x++) {
-            float dev = fabs(new->data.F32[y][x] / numCols / numRows - old->data.F32[y][x]);
-            if (dev > maxDev) {
-                maxDev = dev;
-            }
-        }
-    }
-    ok(maxDev < TOL, "maximum deviation: %f", maxDev);
-    psFree(new);
-    skip_end();
-    skip_end();
-
-    psFree(fftReal);
-    psFree(fftImag);
-    psFree(old);
-    ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
-
-    return;
-}
-
-
-int main(int argc, char *argv[])
-{
-    plan_tests(6 * 5);
-
-    testFFT(10, 10);                    // Real quick test
-    testFFT(10, 20);                    // Testing differing numCols, numRows
-    testFFT(20, 10);                    // Testing differing numCols, numRows
-    testFFT(611, 610);                  // Test something like an OTA cell
-    testFFT(2048, 4096);                // Test something like a megacam chip
-}
Index: trunk/psLib/test/fft/tap_psVectorFFT2.c
===================================================================
--- trunk/psLib/test/fft/tap_psVectorFFT2.c	(revision 12154)
+++ 	(revision )
@@ -1,68 +1,0 @@
-#include <stdio.h>
-#include <math.h>
-#include <pslib.h>
-
-#include "tap.h"
-#include "pstap.h"
-
-#define TOL 2.5e-6                      // Tolerance for comparison
-
-
-// Generate image with single high pixel
-static psVector *generateVector(long num)
-{
-    psVector *vector = psVectorAlloc(num, PS_TYPE_F32);
-    for (long i = 0; i < num; i++) {
-        vector->data.F32[i] = 1.2 * cos(2.0 * M_PI * i / num + M_PI / 4.0) +
-            3.4 * sin(0.5 * 2.0 * M_PI * i / num + M_PI);
-    }
-    return vector;
-}
-
-// FFT forward, then back --- do I get what I started with?
-// A total of 6 tests here.
-static void testFFT(long num)
-{
-    psMemId id = psMemGetId();
-
-    diag("Testing %d", num);
-    psVector *old = generateVector(num);
-    psVector *fftReal = NULL, *fftImag = NULL;
-    bool result = psVectorForwardFFT(&fftReal, &fftImag, old);
-    ok(result, "forward fft result");
-    skip_start(!result || !fftReal || !fftImag, 3, "forward fft failed");
-    ok(fftReal->type.type == PS_TYPE_F32 && fftImag->type.type == PS_TYPE_F32, "forward fft types");
-    psVector *new = NULL;
-    result = psVectorBackwardFFT(&new, fftReal, fftImag, old->n);
-    ok(result, "backward fft result");
-    skip_start(!result || !new, 2, "backward fft failed");
-    ok(new->type.type == PS_TYPE_F32, "backward fft type");
-    float maxDev = 0.0;                 // Maximum deviation from expected
-    for (long i = 0; i < old->n; i++) {
-        float dev = fabs(new->data.F32[i] / num - old->data.F32[i]);
-        if (dev > maxDev) {
-            maxDev = dev;
-        }
-    }
-    ok(maxDev < TOL, "maximum deviation: %f", maxDev);
-    psFree(new);
-    skip_end();
-    skip_end();
-
-    psFree(fftReal);
-    psFree(fftImag);
-    psFree(old);
-    ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
-
-    return;
-}
-
-
-int main(int argc, char *argv[])
-{
-    plan_tests(6 * 3);
-
-    testFFT(128);                       // Real quick test
-    testFFT(2048);                      // Test something big
-    testFFT(123456);                      // Test something really big
-}