Changeset 6377

Timestamp:

Feb 7, 2006, 8:10:29 PM (20 years ago)

Author:

magnier

Message:

changed loop order in pmSourceFitModel to skip 0 weight pixels before creating coord
added psFree for params_min, params_max, beta_lim

File:

• branches/eam_rel9_p0/psModules/src/objects/pmObjects.c (modified) (6 diffs)

branches/eam_rel9_p0/psModules/src/objects/pmObjects.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.5.4.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-01 22:24:05 $
+ *  @version $Revision: 1.5.4.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-08 06:10:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -78 +78 @@
     psFree(tmp->modelPSF);
     psFree(tmp->modelEXT);
+    psFree(tmp->blends);
     psTrace(__func__, 4, "---- %s() end ----\n", __func__);
 }
@@ -1636 +1637 @@
     for (psS32 i = 0; i < source->pixels->numRows; i++) {
         for (psS32 j = 0; j < source->pixels->numCols; j++) {
+            // skip masked points
             if (source->mask->data.U8[i][j]) {
                 continue;
             }
+            // skip zero-weight points
+            if (source->weight->data.F32[i][j] == 0) {
+                continue;
+            }
+
             psVector *coord = psVectorAlloc(2, PS_TYPE_F32);
 
@@ -1646 +1653 @@
             x->data[nPix] = (psPtr *) coord;
             y->data.F32[nPix] = source->pixels->data.F32[i][j];
-
             // psMinimizeLMChi2 takes wt = 1/dY^2
-            if (source->weight->data.F32[i][j] == 0) {
-                continue;
-            }
             yErr->data.F32[nPix] = 1.0 / source->weight->data.F32[i][j];
             nPix++;
@@ -1720 +1723 @@
             dparams->data.F32[i] = delta->data.F64[i];
         }
+        psFree (delta);
     }
 
@@ -1746 +1750 @@
     psFree(covar);
     psFree(paramMask);
+    psFree(params_min);
+    psFree(params_max);
+    psFree(beta_lim);
 
     rc = (onPic && fitStatus);