Changeset 9526 for trunk/psphot/src

Timestamp:

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

Author:

rhl

Message:

Provide symbolic names for model parameters

Location:

trunk/psphot/src

Files:

• psphotApResid.c (modified) (3 diffs)
• psphotGrowthCurve.c (modified) (1 diff)

trunk/psphot/src/psphotApResid.c

@@ -55 +55 @@
         apResid->data.F64[Npsf] = source->apMag - source->psfMag;
 
-        xPos->data.F64[Npsf]    = model->params->data.F32[2];
-        yPos->data.F64[Npsf]    = model->params->data.F32[3];
+        xPos->data.F64[Npsf]    = model->params->data.F32[PM_PAR_XPOS];
+        yPos->data.F64[Npsf]    = model->params->data.F32[PM_PAR_YPOS];
 
         flux->data.F64[Npsf]    = pow(10.0, -0.4*source->psfMag);
@@ -73 +73 @@
         }
 
-        dMag->data.F64[Npsf] = model->dparams->data.F32[1] / model->params->data.F32[1];
+        dMag->data.F64[Npsf] = model->dparams->data.F32[PM_PAR_FLUX] / model->params->data.F32[PM_PAR_FLUX];
 
         psVectorExtend (mask,    100, 1);
@@ -93 +93 @@
     }
 
-    // APTREND options : NONE SKYBIAS XY_LIN XY_QUAD SKY_XY_LIN FULL 
+    // APTREND options are defined by the if ... else if ... else if ... else block below
     char *ApTrendOption = psMetadataLookupPtr (&status, recipe, "APTREND");
     if (!status) ApTrendOption = DEFAULT_OPTION;

trunk/psphot/src/psphotGrowthCurve.c

@@ -23 +23 @@
     // assign the x and y coords to the image center
     // create an object with center intensity of 1000
-    modelRef->params->data.F32[0] = 0;
-    modelRef->params->data.F32[1] = 1000;
-    modelRef->params->data.F32[2] = xc;
-    modelRef->params->data.F32[3] = yc;
+    modelRef->params->data.F32[PM_PAR_SKY] = 0;
+    modelRef->params->data.F32[PM_PAR_FLUX] = 1000;
+    modelRef->params->data.F32[PM_PAR_XPOS] = xc;
+    modelRef->params->data.F32[PM_PAR_YPOS] = yc;
 
     // create modelPSF from this model