Changeset 15562 for trunk/psModules/src/objects/pmModel.c

Timestamp:

Nov 9, 2007, 3:09:20 PM (19 years ago)

Author:

eugene

Message:

updating all changes from from eam_branch_20071023

File:

• trunk/psModules/src/objects/pmModel.c (modified) (7 diffs)

trunk/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 00:04:07 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-10 01:09:20 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -46 +46 @@
     psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
 
-    pmModel *tmp = (pmModel *) psAlloc(sizeof(pmModel));
-    psMemSetDeallocator(tmp, (psFreeFunc) modelFree);
-
     pmModelClass *class = pmModelClassSelect (type);
     if (class == NULL) {
@@ -54 +51 @@
         return(NULL);
     }
+
+    pmModel *tmp = (pmModel *) psAlloc(sizeof(pmModel));
+    psMemSetDeallocator(tmp, (psFreeFunc) modelFree);
 
     tmp->type = type;
@@ -89 +89 @@
 }
 
+bool psMemCheckModel(psPtr ptr)
+{
+    PS_ASSERT_PTR(ptr, false);
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc) modelFree);
+}
+
 // copy model to a new structure
 pmModel *pmModelCopy (pmModel *model)
 {
+    PS_ASSERT_PTR_NON_NULL(model, NULL);
 
     pmModel *new = pmModelAlloc (model->type);
@@ -217 +224 @@
         Ro = psImageInterpolateOptionsAlloc(
             PS_INTERPOLATE_BILINEAR,
-            model->residuals->Ro, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0);
+            model->residuals->Ro, NULL, mask, 0, 0.0, 0.0, 1, 0, 0.0);
         Rx = psImageInterpolateOptionsAlloc(
             PS_INTERPOLATE_BILINEAR,
@@ -257 +264 @@
                 float oy = yBin*(imageRow + 0.5 - yCenter) + yResidCenter;
 
+                psU8 mflux = 0;
                 if (mode & PM_MODEL_OP_RES0) {
-                    psU8 mflux = 0;
                     double Fo = 0.0;
                     psImageInterpolate (&Fo, NULL, &mflux, ox, oy, Ro);
@@ -265 +272 @@
                     }
                 }
-                if (mode & PM_MODEL_OP_RES1) {
-                    psU8 mflux = 0;
+                // skip Rx,Ry if Ro is masked
+                if (!mflux && (mode & PM_MODEL_OP_RES1)) {
                     double Fx = 0.0;
                     double Fy = 0.0;