Changeset 9528 for trunk/psModules/src/objects/models/pmModel_QGAUSS.c

Timestamp:

Oct 12, 2006, 4:29:14 PM (20 years ago)

Author:

rhl

Message:

Renamed PM_PAR_FLUX to PM_PAR_I0

File:

• trunk/psModules/src/objects/models/pmModel_QGAUSS.c (modified) (11 diffs)

trunk/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -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 +32 @@
     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 +38 @@
         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 +65 @@
 
     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 +74 @@
 
     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 +83 @@
 
     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 +103 @@
 
     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 +143 @@
     norm *= DZ / 3.0;
 
-    psF64 Flux = PAR[PM_PAR_FLUX] * Area * norm;
+    psF64 Flux = PAR[PM_PAR_I0] * Area * norm;
 
     return(Flux);
@@ -158 +158 @@
     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 +225 @@
 
     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 +255 @@
     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)