Changeset 32755

Timestamp:

Nov 22, 2011, 10:30:49 AM (15 years ago)

Author:

eugene

Message:

merging changes from trunk (add psImageSmooth_PreAlloc to minimize memory locking; catch possible memory corruption)

Location:

tags/ipp-20111110/psphot/src

Files:

• psphotExtendedSourceFits.c (modified) (2 diffs)
• psphotRadialProfileWings.c (modified) (1 diff)
• psphotReplaceUnfit.c (modified) (1 diff)
• psphotSourceFits.c (modified) (2 diffs)
• psphotSourceMatch.c (modified) (1 prop)

tags/ipp-20111110/psphot/src/psphotExtendedSourceFits.c

@@ -321 +321 @@
 
         // set the fit radius based on the first radial moment (also sets the mask pixels)
-        psphotSetRadiusMomentsExact(&fitRadius, &windowRadius, readout, source, markVal);
+        psphotSetRadiusMomentsExact(&fitRadius, &windowRadius, readout, source, markVal); // NOTE : 6 allocs
 
         // UPDATE : we have changed the moments calculation.  There is now an iteration within 
@@ -371 +371 @@
           pmModel *modelFit = NULL;
           if (convolved) {
-              modelFit = psphotFitPCM (readout, source, fitOptions, modelType, maskVal, markVal, psfSize);
+              // NOTE : 4 more allocs to here
+              modelFit = psphotFitPCM (readout, source, fitOptions, modelType, maskVal, markVal, psfSize); // NOTE : 2313 allocs in here
               if (!modelFit) {
                   psTrace ("psphot", 5, "failed to fit psf-conv model for object at %f, %f", source->moments->Mx, source->moments->My);

tags/ipp-20111110/psphot/src/psphotRadialProfileWings.c

@@ -261 +261 @@
         psStatsInit (fluxStats);
         psStatsInit (varStats);
+
+        if ((flux->n == 0) || (fluxVar->n == 0)) {
+            flux->n = 0;
+            fluxVar->n = 0;
+            radius += dR;
+            continue;
+        }
 
         psVectorStats (fluxStats, flux, NULL, NULL, 0);

tags/ipp-20111110/psphot/src/psphotReplaceUnfit.c

@@ -353 +353 @@
             source->modelPSF = modelPSF;
             source->modelPSF->fitRadius = radius;
+            model = source->modelPSF;
         }
 

tags/ipp-20111110/psphot/src/psphotSourceFits.c

@@ -531 +531 @@
     if (TIMING) { t1 = psTimerMark ("psphotFitPCM"); }
 
+    // NOTE : 65 allocs to here
     // get the guess for sersic models 
     if (modelType == pmModelClassGetType("PS_MODEL_SERSIC")) {
@@ -560 +561 @@
 
     // psTraceSetLevel("psLib.math.psMinimizeLMChi2", 5);
-    pmSourceFitPCM (pcm, source, &options, maskVal, markVal, psfSize);
+    pmSourceFitPCM (pcm, source, &options, maskVal, markVal, psfSize);  // NOTE : 1687 allocs in here
     if (TIMING) { t5 = psTimerMark ("psphotFitPCM"); }