Index: trunk/psModules/src/objects/models/pmModel_QGAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 9527)
+++ trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 9528)
@@ -5,5 +5,5 @@
  
     params->data.F32[PM_PAR_SKY] = So;
-    params->data.F32[PM_PAR_FLUX] = Zo;
+    params->data.F32[PM_PAR_I0] = Zo;
     params->data.F32[PM_PAR_XPOS] = Xo;
     params->data.F32[PM_PAR_YPOS] = Yo;
@@ -32,5 +32,5 @@
     psF32 r  = 1.0 / (1 + PAR[PM_PAR_7]*z + z*zp);
 
-    psF32 r1 = PAR[PM_PAR_FLUX]*r;
+    psF32 r1 = PAR[PM_PAR_I0]*r;
     psF32 f  = r1 + PAR[PM_PAR_SKY];
 
@@ -38,10 +38,10 @@
         psF32 *dPAR = deriv->data.F32;
 
-        // note difference from a pure gaussian: q = params->data.F32[PM_PAR_FLUX]*r
+        // note difference from a pure gaussian: q = params->data.F32[PM_PAR_I0]*r
         psF32 t = r1*r;
         psF32 q = t*(PAR[PM_PAR_7] + 2.25*zp);
 
         dPAR[PM_PAR_SKY] = +1.0;
-        dPAR[PM_PAR_FLUX] = +r;
+        dPAR[PM_PAR_I0] = +r;
         dPAR[PM_PAR_XPOS] = q*(2.0*px*PAR[PM_PAR_SXX] + PAR[PM_PAR_SXY]*Y);
         dPAR[PM_PAR_YPOS] = q*(2.0*py*PAR[PM_PAR_SYY] + PAR[PM_PAR_SXY]*X);
@@ -65,5 +65,5 @@
 
     beta_lim[0][0].data.F32[PM_PAR_SKY] = 1000;
-    beta_lim[0][0].data.F32[PM_PAR_FLUX] = 3e6;
+    beta_lim[0][0].data.F32[PM_PAR_I0] = 3e6;
     beta_lim[0][0].data.F32[PM_PAR_XPOS] = 5;
     beta_lim[0][0].data.F32[PM_PAR_YPOS] = 5;
@@ -74,5 +74,5 @@
 
     params_min[0][0].data.F32[PM_PAR_SKY] = -1000;
-    params_min[0][0].data.F32[PM_PAR_FLUX] = 0;
+    params_min[0][0].data.F32[PM_PAR_I0] = 0;
     params_min[0][0].data.F32[PM_PAR_XPOS] = -100;
     params_min[0][0].data.F32[PM_PAR_YPOS] = -100;
@@ -83,5 +83,5 @@
 
     params_max[0][0].data.F32[PM_PAR_SKY] = 1e5;
-    params_max[0][0].data.F32[PM_PAR_FLUX] = 1e8;
+    params_max[0][0].data.F32[PM_PAR_I0] = 1e8;
     params_max[0][0].data.F32[PM_PAR_XPOS] = 1e4;  // this should be set by image dimensions!
     params_max[0][0].data.F32[PM_PAR_YPOS] = 1e4;  // this should be set by image dimensions!
@@ -103,5 +103,5 @@
 
     params[PM_PAR_SKY] = moments->Sky;
-    params[PM_PAR_FLUX] = moments->Peak - moments->Sky;
+    params[PM_PAR_I0] = moments->Peak - moments->Sky;
     params[PM_PAR_XPOS] = peak->x;
     params[PM_PAR_YPOS] = peak->y;
@@ -143,5 +143,5 @@
     norm *= DZ / 3.0;
 
-    psF64 Flux = PAR[PM_PAR_FLUX] * Area * norm;
+    psF64 Flux = PAR[PM_PAR_I0] * Area * norm;
 
     return(Flux);
@@ -158,12 +158,12 @@
     if (flux <= 0)
         return (1.0);
-    if (PAR[PM_PAR_FLUX] <= 0)
+    if (PAR[PM_PAR_I0] <= 0)
         return (1.0);
-    if (flux >= PAR[PM_PAR_FLUX])
+    if (flux >= PAR[PM_PAR_I0])
         return (1.0);
 
     // if Sx == Sy, sigma = Sx == Sy
     psF64 sigma = hypot (1.0 / PAR[PM_PAR_SXX], 1.0 / PAR[PM_PAR_SYY]) / sqrt(2.0);
-    psF64 limit = flux / PAR[PM_PAR_FLUX];
+    psF64 limit = flux / PAR[PM_PAR_I0];
 
     # if 0
@@ -225,5 +225,5 @@
 
     out[PM_PAR_SKY] = in[PM_PAR_SKY];
-    out[PM_PAR_FLUX] = in[PM_PAR_FLUX];
+    out[PM_PAR_I0] = in[PM_PAR_I0];
     out[PM_PAR_XPOS] = in[PM_PAR_XPOS];
     out[PM_PAR_YPOS] = in[PM_PAR_YPOS];
@@ -255,6 +255,6 @@
     status = true;
     status &= (dP < 0.5);
-    status &= (PAR[PM_PAR_FLUX] > 0);
-    status &= ((dPAR[PM_PAR_FLUX]/PAR[PM_PAR_FLUX]) < 0.5);
+    status &= (PAR[PM_PAR_I0] > 0);
+    status &= ((dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]) < 0.5);
 
     if (!status)
Index: trunk/psModules/src/objects/pmModel.h
===================================================================
--- trunk/psModules/src/objects/pmModel.h	(revision 9527)
+++ trunk/psModules/src/objects/pmModel.h	(revision 9528)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-22 12:24:38 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 02:29:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -54,13 +54,13 @@
  * may/will correspond to different parameters in different contexts
  */
-#define PM_PAR_SKY 0   // Sky
-#define PM_PAR_FLUX 1   // Flux
-#define PM_PAR_XPOS 2   // X centre of object
-#define PM_PAR_YPOS 3   // Y centre of object
-#define PM_PAR_SXX 4   // shape X^2 moment
-#define PM_PAR_SYY 5   // shape Y^2 moment
-#define PM_PAR_SXY 6   // shape XY moment
-#define PM_PAR_7 7   // ??? Unknown parameter
-#define PM_PAR_8 8   // ??? Unknown parameter
+#define PM_PAR_SKY 0   ///< Sky
+#define PM_PAR_I0 1   ///< Central intensity
+#define PM_PAR_XPOS 2   ///< X centre of object
+#define PM_PAR_YPOS 3   ///< Y centre of object
+#define PM_PAR_SXX 4   ///< shape X^2 moment
+#define PM_PAR_SYY 5   ///< shape Y^2 moment
+#define PM_PAR_SXY 6   ///< shape XY moment
+#define PM_PAR_7 7   ///< ??? Unknown parameter
+#define PM_PAR_8 8   ///< ??? Unknown parameter
 
 /** pmModelAlloc()
Index: trunk/psModules/src/objects/pmPSFtry.c
===================================================================
--- trunk/psModules/src/objects/pmPSFtry.c	(revision 9527)
+++ trunk/psModules/src/objects/pmPSFtry.c	(revision 9528)
@@ -5,6 +5,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-05 23:40:52 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 02:29:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -191,5 +191,5 @@
     psTrace ("psphot.psftry", 3, "keeping %d of %ld PSF candidates (PSF)\n", Npsf, sources->n);
 
-    // measure the chi-square trend as a function of flux (PAR[PM_PAR_FLUX])
+    // measure the chi-square trend as a function of flux (PAR[PM_PAR_I0])
     // this should be linear for Poisson errors and quadratic for constant sky errors
     psVector *flux  = psVectorAlloc (psfTry->sources->n, PS_TYPE_F64);
@@ -206,5 +206,5 @@
             mask->data.U8[i] = 1;
         } else {
-            flux->data.F64[i] = model->params->data.F32[PM_PAR_FLUX];
+            flux->data.F64[i] = model->params->data.F32[PM_PAR_I0];
             chisq->data.F64[i] = model[0].chisq/model[0].nDOF;
             mask->data.U8[i] = 0;
Index: trunk/psModules/src/objects/pmSourceFitModel.c
===================================================================
--- trunk/psModules/src/objects/pmSourceFitModel.c	(revision 9527)
+++ trunk/psModules/src/objects/pmSourceFitModel.c	(revision 9528)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 02:23:55 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 02:29:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -136,10 +136,10 @@
         // NORM-only model fits only source normalization (Io)
         nParams = 1;
-        paramMask->data.U8[PM_PAR_FLUX] = 0;
+        paramMask->data.U8[PM_PAR_I0] = 0;
         break;
     case PM_SOURCE_FIT_PSF:
         // PSF model only fits x,y,Io
         nParams = 3;
-        paramMask->data.U8[PM_PAR_FLUX] = 0;
+        paramMask->data.U8[PM_PAR_I0] = 0;
         paramMask->data.U8[PM_PAR_XPOS] = 0;
         paramMask->data.U8[PM_PAR_YPOS] = 0;
Index: trunk/psModules/src/objects/pmSourceIO_OBJ.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_OBJ.c	(revision 9527)
+++ trunk/psModules/src/objects/pmSourceIO_OBJ.c	(revision 9528)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-22 12:24:38 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 02:29:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -62,5 +62,5 @@
         dPAR = model->dparams->data.F32;
 
-        dmag = dPAR[PM_PAR_FLUX] / PAR[PM_PAR_FLUX];
+        dmag = dPAR[PM_PAR_I0] / PAR[PM_PAR_I0];
         type = pmSourceDophotType (source);
         if ((source->apMag < 99.0) && (source->psfMag < 99.0)) {
Index: trunk/psModules/src/objects/pmSourcePhotometry.c
===================================================================
--- trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 9527)
+++ trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 9528)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 02:24:34 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 02:29:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -95,6 +95,6 @@
     }
 
-    if (model->dparams->data.F32[PM_PAR_FLUX] > 0) {
-        SN = model->params->data.F32[PM_PAR_FLUX] / model->dparams->data.F32[PM_PAR_FLUX];
+    if (model->dparams->data.F32[PM_PAR_I0] > 0) {
+        SN = model->params->data.F32[PM_PAR_I0] / model->dparams->data.F32[PM_PAR_I0];
         source->errMag = 1.0 / SN;
     } else {