Changeset 28908

Timestamp:

Aug 13, 2010, 12:17:35 PM (16 years ago)

Author:

eugene

Message:

add options for FFT and pre-convolved FFT

Location:

branches/eam_branches/ipp-20100621/psModules/src/objects

Files:

• pmPCM_MinimizeChisq.c (modified) (4 diffs)
• pmPCMdata.c (modified) (2 diffs)
• pmPCMdata.h (modified) (1 diff)

branches/eam_branches/ipp-20100621/psModules/src/objects/pmPCM_MinimizeChisq.c

@@ -43 +43 @@
 # define FACILITY "psModules.objects"
 
+# define USE_FFT 1
+# define PRE_CONVOLVE 1
+
 bool pmPCM_MinimizeChisq (
     psMinimization *min,
@@ -86 +89 @@
     psF32 dLinear = 0.0;
 
+# if (USE_FFT && PRE_CONVOLVE)
+    if (pcm->psfFFT) {
+        psFree (pcm->psfFFT);
+    }
+    pcm->psfFFT = psImageConvolveKernelInit(pcm->modelFlux, pcm->psf);
+# endif    
+
     // calculate initial alpha and beta, set chisq (min->value)
     min->value = pmPCM_SetABX(alpha, beta, params, paramMask, pcm, source);
@@ -293 +303 @@
     // XXX speed this up by saving the FFTed psf (for each source, obviously)
 
+    // XXX save the FFT'ed psf
+    // XXX create an alternative function which takes a pre-FFTed kernel
+
+# if (USE_FFT)
+# if (PRE_CONVOLVE)
+    // convolve model image and derivative images with pre-convolved kernel
+    psImageConvolveKernel (pcm->modelConvFlux, pcm->modelFlux, NULL, 0, pcm->psfFFT);
+    for (int n = 0; n < pcm->dmodelsFlux->n; n++) {
+        if (pcm->dmodelsFlux->data[n] == NULL) continue;
+        psImage *dmodel = pcm->dmodelsFlux->data[n];
+        psImage *dmodelConv = pcm->dmodelsConvFlux->data[n];
+        psImageConvolveKernel (dmodelConv, dmodel, NULL, 0, pcm->psfFFT);
+    }
+# else
+    // convolve model image and derivative images with psf via FFT
+    psImageConvolveFFT (pcm->modelConvFlux, pcm->modelFlux, NULL, 0, pcm->psf);
+    for (int n = 0; n < pcm->dmodelsFlux->n; n++) {
+        if (pcm->dmodelsFlux->data[n] == NULL) continue;
+        psImage *dmodel = pcm->dmodelsFlux->data[n];
+        psImage *dmodelConv = pcm->dmodelsConvFlux->data[n];
+        psImageConvolveFFT (dmodelConv, dmodel, NULL, 0, pcm->psf);
+    }
+# endif // PRE-CONVOLVE
+# else
+    // convolve model image and derivative images with psf direct
     psImageConvolveDirect (pcm->modelConvFlux, pcm->modelFlux, pcm->psf);
     for (int n = 0; n < pcm->dmodelsFlux->n; n++) {
@@ -300 +335 @@
         psImageConvolveDirect (dmodelConv, dmodel, pcm->psf);
     }
+# endif // USE_FFT
 
     // XXX TEST : SAVE IMAGES

branches/eam_branches/ipp-20100621/psModules/src/objects/pmPCMdata.c

@@ -52 +52 @@
     psFree (pcm->modelConv);
     psFree (pcm->psf);
+    psFree (pcm->psfFFT);
     psFree (pcm->constraint);
     return;
@@ -84 +85 @@
     pcm->modelConv = NULL;
     pcm->psf = NULL;
+    pcm->psfFFT = NULL;
     pcm->constraint = NULL;
     pcm->nDOF = 0;

branches/eam_branches/ipp-20100621/psModules/src/objects/pmPCMdata.h

@@ -29 +29 @@
     pmModel *modelConv;
     psKernel *psf;
+    psKernelFFT *psfFFT;
+
     psMinConstraint *constraint;
     int nPix;