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

Timestamp:

Nov 8, 2013, 3:22:59 PM (13 years ago)

Author:

eugene

Message:

working on 2d convolve issues for psphot galaxies

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

@@ -477 +477 @@
         // * threading takes place above this level
         pcm->modelConvFlux = psImageCopy (pcm->modelConvFlux, pcm->modelFlux, pcm->modelFlux->type.type);
-        psImageSmoothCache_F32 (pcm->modelConvFlux, pcm->smdata);
+        
+        // hard-wire this for now?
+        psImageSmoothCache_F32 (pcm->modelConvFlux, pcm->smdata1);
+        psImageSmoothCache_F32 (pcm->modelConvFlux, pcm->smdata2);
     } else {
         psImageConvolveKernel (pcm->modelConvFlux, pcm->modelFlux, NULL, 0, pcm->psfFFT);
@@ -496 +499 @@
             // * threading takes place above this level
             dmodelConv = psImageCopy (dmodelConv, dmodel, dmodel->type.type);
-            psImageSmoothCache_F32 (dmodelConv, pcm->smdata);
+            psImageSmoothCache_F32 (dmodelConv, pcm->smdata1);
+            psImageSmoothCache_F32 (dmodelConv, pcm->smdata2);
         } else {
             psImageConvolveKernel (dmodelConv, dmodel, NULL, 0, pcm->psfFFT);
@@ -516 +520 @@
             // * threading takes place above this level
             dmodelConv = psImageCopy (dmodelConv, dmodel, dmodel->type.type);
-            psImageSmoothCache_F32 (dmodelConv, pcm->smdata);
+            psImageSmoothCache_F32 (dmodelConv, pcm->smdata1);
+            psImageSmoothCache_F32 (dmodelConv, pcm->smdata2);
         } else {
             psImageConvolveFFT (dmodelConv, dmodel, NULL, 0, pcm->psf);