Changeset 31926 for branches/eam_branches/ipp-20110710/psModules/src/objects/pmPCM_MinimizeChisq.c

Timestamp:

Jul 22, 2011, 5:08:37 PM (15 years ago)

Author:

eugene

Message:

allow pcm fitting with a 1d gauss instead of full convolution

File:

• branches/eam_branches/ipp-20110710/psModules/src/objects/pmPCM_MinimizeChisq.c (modified) (5 diffs)

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

@@ -45 +45 @@
 # define USE_FFT 1
 # define PRE_CONVOLVE 1
+# define TESTCOPY 0
 
 bool pmPCM_MinimizeChisq (
@@ -93 +94 @@
         psFree (pcm->psfFFT);
     }
-    pcm->psfFFT = psImageConvolveKernelInit(pcm->modelFlux, pcm->psf);
+# if (!TESTCOPY)
+    if (!pcm->use1Dgauss) {
+        pcm->psfFFT = psImageConvolveKernelInit(pcm->modelFlux, pcm->psf);
+    }
+# endif
 # endif    
 
@@ -309 +314 @@
 # if (PRE_CONVOLVE)
     // convolve model image and derivative images with pre-convolved kernel
-    psImageConvolveKernel (pcm->modelConvFlux, pcm->modelFlux, NULL, 0, pcm->psfFFT);
+
+// XXX for a test, just copy, rather than convolve
+# if (TESTCOPY)
+    psImageCopy (pcm->modelConvFlux, pcm->modelFlux, pcm->modelFlux->type.type);
+# else
+    if (pcm->use1Dgauss) {
+        // do not use the threaded, mask-aware version of this code (psImageSmoothMaskPixelsThread):
+        // * the model flux is not masked
+        // * threading takes place above this level
+        pcm->modelConvFlux = psImageCopy (pcm->modelConvFlux, pcm->modelFlux, pcm->modelFlux->type.type);
+        psImageSmooth (pcm->modelConvFlux, pcm->sigma, pcm->nsigma);
+    } else {
+        psImageConvolveKernel (pcm->modelConvFlux, pcm->modelFlux, NULL, 0, pcm->psfFFT);
+    }
+# endif
+
     for (int n = 0; n < pcm->dmodelsFlux->n; n++) {
         if (pcm->dmodelsFlux->data[n] == NULL) continue;
@@ -315 +335 @@
         psImage *dmodel = pcm->dmodelsFlux->data[n];
         psImage *dmodelConv = pcm->dmodelsConvFlux->data[n];
-        psImageConvolveKernel (dmodelConv, dmodel, NULL, 0, pcm->psfFFT);
+# if (TESTCOPY)
+        psImageCopy (dmodelConv, dmodel, dmodel->type.type);
+# else
+        if (pcm->use1Dgauss) {
+            // do not use the threaded, mask-aware version of this code (psImageSmoothMaskPixelsThread):
+            // * the model flux is not masked
+            // * threading takes place above this level
+            dmodelConv = psImageCopy (dmodelConv, dmodel, dmodel->type.type);
+            psImageSmooth (dmodelConv, pcm->sigma, pcm->nsigma);
+        } else {
+            psImageConvolveKernel (dmodelConv, dmodel, NULL, 0, pcm->psfFFT);
+        }
+# endif
     }
 # else
@@ -325 +357 @@
         psImage *dmodel = pcm->dmodelsFlux->data[n];
         psImage *dmodelConv = pcm->dmodelsConvFlux->data[n];
-        psImageConvolveFFT (dmodelConv, dmodel, NULL, 0, pcm->psf);
+
+        if (pcm->use1Dgauss) {
+            // do not use the threaded, mask-aware version of this code (psImageSmoothMaskPixelsThread):
+            // * the model flux is not masked
+            // * threading takes place above this level
+            dmodelConv = psImageCopy (dmodelConv, dmodel, dmodel->type.type);
+            psImageSmooth (dmodelConv, pcm->sigma, pcm->nsigma);
+        } else {
+            psImageConvolveFFT (dmodelConv, dmodel, NULL, 0, pcm->psf);
+        }
     }
 # endif // PRE-CONVOLVE