Changeset 32725 for trunk/psModules

Timestamp:

Nov 20, 2011, 3:55:38 PM (15 years ago)

Author:

eugene

Message:

create a pre-alloc version of image smooth to avoid excessive allocs

Location:

trunk/psModules/src/objects

Files:

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

trunk/psModules/src/objects/pmPCM_MinimizeChisq.c

@@ -324 +324 @@
         // * threading takes place above this level
         pcm->modelConvFlux = psImageCopy (pcm->modelConvFlux, pcm->modelFlux, pcm->modelFlux->type.type);
-        psImageSmooth (pcm->modelConvFlux, pcm->sigma, pcm->nsigma);
+        psImageSmooth_PreAlloc_F32 (pcm->modelConvFlux, pcm->smdata);
+        // psImageSmooth (pcm->modelConvFlux, pcm->sigma, pcm->nsigma);
     } else {
         psImageConvolveKernel (pcm->modelConvFlux, pcm->modelFlux, NULL, 0, pcm->psfFFT);
@@ -343 +344 @@
             // * threading takes place above this level
             dmodelConv = psImageCopy (dmodelConv, dmodel, dmodel->type.type);
-            psImageSmooth (dmodelConv, pcm->sigma, pcm->nsigma);
+            psImageSmooth_PreAlloc_F32 (dmodelConv, pcm->smdata);
+            // psImageSmooth (dmodelConv, pcm->sigma, pcm->nsigma);
         } else {
             psImageConvolveKernel (dmodelConv, dmodel, NULL, 0, pcm->psfFFT);
@@ -363 +365 @@
             // * threading takes place above this level
             dmodelConv = psImageCopy (dmodelConv, dmodel, dmodel->type.type);
-            psImageSmooth (dmodelConv, pcm->sigma, pcm->nsigma);
+            psImageSmooth_PreAlloc_F32 (dmodelConv, pcm->smdata);
+            // psImageSmooth (dmodelConv, pcm->sigma, pcm->nsigma);
         } else {
             psImageConvolveFFT (dmodelConv, dmodel, NULL, 0, pcm->psf);

trunk/psModules/src/objects/pmPCMdata.c

@@ -57 +57 @@
     psFree (pcm->psfFFT);
     psFree (pcm->constraint);
+    psFree (pcm->smdata); // pre-allocated data for psImageSmooth_PreAlloc
     return;
 }
@@ -284 +285 @@
     pcm->sigma = 0.5 * (FWHM_MAJOR + FWHM_MINOR) / 2.35;
     pcm->nsigma = 2.0;
+
+    pcm->smdata = psImageSmooth_PreAlloc_DataAlloc (source->pixels, pcm->sigma, pcm->nsigma);
+# else
+    pcm->smdata = NULL;
 # endif
 
@@ -393 +398 @@
             pcm->dmodelsConvFlux->data[n] = psImageCopy (pcm->dmodelsConvFlux->data[n], source->pixels, PS_TYPE_F32);
         }
+        psFree(pcm->smdata);
+        pcm->smdata = psImageSmooth_PreAlloc_DataAlloc (source->pixels, pcm->sigma, pcm->nsigma);
     }
 

trunk/psModules/src/objects/pmPCMdata.h

@@ -39 +39 @@
     float sigma;
     float nsigma;
+
+    psImageSmooth_PreAlloc_Data *smdata;
 } pmPCMdata;