Changeset 15359 for branches/eam_branch_20071023/psModules/src/objects/pmModel.c

Timestamp:

Oct 23, 2007, 10:54:53 AM (19 years ago)

Author:

eugene

Message:

adding pieces for astrometry table I/O, extended source analysis

File:

• branches/eam_branch_20071023/psModules/src/objects/pmModel.c (modified) (4 diffs)

branches/eam_branch_20071023/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.15.6.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-23 20:54:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -217 +217 @@
         Ro = psImageInterpolateOptionsAlloc(
             PS_INTERPOLATE_BILINEAR,
-            model->residuals->Ro, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0);
+            model->residuals->Ro, NULL, model->mask, 0, 0.0, 0.0, 1, 0, 0.0);
         Rx = psImageInterpolateOptionsAlloc(
             PS_INTERPOLATE_BILINEAR,
@@ -257 +257 @@
                 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 +265 @@
                     }
                 }
-                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;