Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/objects/pmPCM_MinimizeChisq.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmPCM_MinimizeChisq.c (modified) (6 diffs)

branches/meh_branches/ppstack_test/psModules/src/objects

@@ -5 +5 @@
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c
+

@@ -5 +5 @@
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c
+

branches/meh_branches/ppstack_test/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    
 
@@ -285 +290 @@
 
             // Convert i/j to image space:
-            coord->data.F32[0] = (psF32) (j + source->pixels->col0);
-            coord->data.F32[1] = (psF32) (i + source->pixels->row0);
+            coord->data.F32[0] = (psF32) (j + 0.5 + source->pixels->col0);
+            coord->data.F32[1] = (psF32) (i + 0.5 + source->pixels->row0);
 
             pcm->modelFlux->data.F32[i][j] = pcm->modelConv->modelFunc (deriv, params, coord);
@@ -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_PreAlloc_F32 (pcm->modelConvFlux, pcm->smdata);
+        // 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 +336 @@
         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_PreAlloc_F32 (dmodelConv, pcm->smdata);
+            // psImageSmooth (dmodelConv, pcm->sigma, pcm->nsigma);
+        } else {
+            psImageConvolveKernel (dmodelConv, dmodel, NULL, 0, pcm->psfFFT);
+        }
+# endif
     }
 # else
@@ -325 +359 @@
         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_PreAlloc_F32 (dmodelConv, pcm->smdata);
+            // psImageSmooth (dmodelConv, pcm->sigma, pcm->nsigma);
+        } else {
+            psImageConvolveFFT (dmodelConv, dmodel, NULL, 0, pcm->psf);
+        }
     }
 # endif // PRE-CONVOLVE

@@ -5 +5 @@
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c
+