Changeset 36281 for branches/eam_branches/ipp-20130904/psModules/src/objects/pmPCM_MinimizeChisq.c

Timestamp:

Nov 11, 2013, 11:20:15 AM (13 years ago)

Author:

eugene

Message:

add 2d cached convolution to the convolution concepts (clear this out when I am happy)

File:

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

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

@@ -473 +473 @@
 # 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);
-        
-        // hard-wire this for now?
-        psImageSmoothCache_F32 (pcm->modelConvFlux, pcm->smdata1);
-        psImageSmoothCache_F32 (pcm->modelConvFlux, pcm->smdata2);
+
+        if (USE_1D_CACHE) {
+            // 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);
+            psImageSmoothCache_F32 (pcm->modelConvFlux, pcm->smdata);
+        } else {
+            pcm->modelConvFlux = psImageCopy (pcm->modelConvFlux, pcm->modelFlux, pcm->modelFlux->type.type);
+            psImageSmooth2dCache_F32 (pcm->modelConvFlux, pcm->smdata2d);
+        }
     } else {
         psImageConvolveKernel (pcm->modelConvFlux, pcm->modelFlux, NULL, 0, pcm->psfFFT);
@@ -495 +498 @@
 # 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);
-            psImageSmoothCache_F32 (dmodelConv, pcm->smdata1);
-            psImageSmoothCache_F32 (dmodelConv, pcm->smdata2);
+            if (USE_1D_GAUSS) {
+                // 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);
+                psImageSmoothCache_F32 (dmodelConv, pcm->smdata);
+            } else {
+                dmodelConv = psImageCopy (dmodelConv, dmodel, dmodel->type.type);
+                psImageSmooth2dCache_F32 (dmodelConv, pcm->smdata2d);
+            }
         } else {
             psImageConvolveKernel (dmodelConv, dmodel, NULL, 0, pcm->psfFFT);
@@ -516 +523 @@
 
         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);
-            psImageSmoothCache_F32 (dmodelConv, pcm->smdata1);
-            psImageSmoothCache_F32 (dmodelConv, pcm->smdata2);
+            if (USE_1D_GAUSS) {
+                // 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);
+                psImageSmoothCache_F32 (dmodelConv, pcm->smdata);
+            } else {
+                dmodelConv = psImageCopy (dmodelConv, dmodel, dmodel->type.type);
+                psImageSmooth2dCache_F32 (dmodelConv, pcm->smdata2d);
+            }
         } else {
             psImageConvolveFFT (dmodelConv, dmodel, NULL, 0, pcm->psf);