Changeset 9526 for trunk/psModules/src/objects/pmSourceFitModel.c

Timestamp:

Oct 12, 2006, 4:23:55 PM (20 years ago)

Author:

rhl

Message:

Provide symbolic names for model parameters

File:

• trunk/psModules/src/objects/pmSourceFitModel.c (modified) (4 diffs)

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 02:23:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -136 +136 @@
         // NORM-only model fits only source normalization (Io)
         nParams = 1;
-        paramMask->data.U8[1] = 0;
+        paramMask->data.U8[PM_PAR_FLUX] = 0;
         break;
     case PM_SOURCE_FIT_PSF:
         // PSF model only fits x,y,Io
         nParams = 3;
-        paramMask->data.U8[1] = 0;
-        paramMask->data.U8[2] = 0;
-        paramMask->data.U8[3] = 0;
+        paramMask->data.U8[PM_PAR_FLUX] = 0;
+        paramMask->data.U8[PM_PAR_XPOS] = 0;
+        paramMask->data.U8[PM_PAR_YPOS] = 0;
         break;
     case PM_SOURCE_FIT_EXT:
@@ -149 +149 @@
         nParams = params->n - 1;
         psVectorInit (paramMask, 0);
-        paramMask->data.U8[0] = 1;
+        paramMask->data.U8[PM_PAR_SKY] = 1;
         break;
     case PM_SOURCE_FIT_PSF_AND_SKY:
@@ -226 +226 @@
 
     // models can go insane: reject these
-    onPic &= (params->data.F32[2] >= source->pixels->col0);
-    onPic &= (params->data.F32[2] <  source->pixels->col0 + source->pixels->numCols);
-    onPic &= (params->data.F32[3] >= source->pixels->row0);
-    onPic &= (params->data.F32[3] <  source->pixels->row0 + source->pixels->numRows);
+    onPic &= (params->data.F32[PM_PAR_XPOS] >= source->pixels->col0);
+    onPic &= (params->data.F32[PM_PAR_XPOS] <  source->pixels->col0 + source->pixels->numCols);
+    onPic &= (params->data.F32[PM_PAR_YPOS] >= source->pixels->row0);
+    onPic &= (params->data.F32[PM_PAR_YPOS] <  source->pixels->row0 + source->pixels->numRows);
     if (!onPic) {
         model->status = PM_MODEL_OFFIMAGE;