Changeset 12956 for branches/eam_02_branch/psModules/src/objects/pmModel.c

Timestamp:

Apr 22, 2007, 5:26:23 PM (19 years ago)

Author:

magnier

Message:

changed PM_MODEL_ADD_.. to PM_MODEL_OP_..; added pmSourceAdd/Sub; adding modelFlux and maskView/maskObj to pmSource

File:

• branches/eam_02_branch/psModules/src/objects/pmModel.c (modified) (6 diffs)

branches/eam_02_branch/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.9.6.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-21 21:30:21 $
+ *  @version $Revision: 1.9.6.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-23 03:26:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -160 +160 @@
     float skySave = params->data.F32[PM_PAR_SKY];
 
-    if (mode & PM_MODEL_ADD_NORM) {
+    if (mode & PM_MODEL_OP_NORM) {
         params->data.F32[PM_PAR_I0] = 1.0;
     }
-    if (!(mode & PM_MODEL_ADD_SKY)) {
+    if (!(mode & PM_MODEL_OP_SKY)) {
         params->data.F32[PM_PAR_SKY] = 0.0;
     }
-    if (mode & PM_MODEL_ADD_CENTER) {
+    if (mode & PM_MODEL_OP_CENTER) {
         params->data.F32[PM_PAR_XPOS] = image->col0 + 0.5*image->numCols;
         params->data.F32[PM_PAR_YPOS] = image->row0 + 0.5*image->numRows;
@@ -184 +184 @@
     psImageInterpolateOptions *Rx = NULL;
     psImageInterpolateOptions *Ry = NULL;
-    if (model->residuals && (mode & (PM_MODEL_ADD_RES0 | PM_MODEL_ADD_RES1))) {
+    if (model->residuals && (mode & (PM_MODEL_OP_RES0 | PM_MODEL_OP_RES1))) {
         Ro = psImageInterpolateOptionsAlloc(
             PS_INTERPOLATE_BILINEAR,
@@ -217 +217 @@
 
             // add in the desired components for this coordinate
-            if (mode & PM_MODEL_ADD_FUNC) {
+            if (mode & PM_MODEL_OP_FUNC) {
                 pixelValue += modelFunc (NULL, params, x);
             } 
@@ -227 +227 @@
                 float oy = yBin*(imageRow + 0.5 - yCenter) + yResidCenter;
 
-                if (mode & PM_MODEL_ADD_RES0) {
+                if (mode & PM_MODEL_OP_RES0) {
                     psU8 mflux = 0;
                     double Fo = 0.0;
@@ -235 +235 @@
                     }
                 }
-                if (mode & PM_MODEL_ADD_RES1) {
+                if (mode & PM_MODEL_OP_RES1) {
                     psU8 mflux = 0;
                     double Fx = 0.0;