Changeset 4420 for trunk/Ohana/src/opihi/cmd.astro

Timestamp:

Jun 28, 2005, 2:40:42 PM (21 years ago)

Author:

eugene

Message:

minor dvo updates

File:

• trunk/Ohana/src/opihi/cmd.astro/imfit-qrgauss.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.astro/imfit-qrgauss.c

@@ -44 +44 @@
 }
 
+float qrgaussTD (float x, float y, float *par, int Npar, float *dpar) {
+
+  float X, Y, px, py;
+  float z, r, q, f;
+
+  X = x - par[0];
+  Y = y - par[1];
+  
+  px = par[2]*X;
+  py = par[3]*Y;
+
+  z = 0.5*SQ(px) + 0.5*SQ(py) + par[4]*X*Y;
+
+  r = 1.0 / (1 + fpar[0]*z + pow(z,par[7]));
+  f = par[5]*r + par[6];
+  q = par[5]*SQ(r)*(fpar[0] + par[7]*pow(z,(par[7]-1)));
+
+  if (dpar != NULL) {
+    dpar[0] = q*(2*px*par[2] + par[4]*Y);
+    dpar[1] = q*(2*py*par[3] + par[4]*X);
+    dpar[2] = -2*q*px*X*2;
+    dpar[3] = -2*q*py*Y*2;
+    dpar[4] = -q*X*Y;
+    dpar[5] = +r;
+    dpar[6] = +1;
+    dpar[7] = -5*par[5]*SQ(r)*log(z)*pow(z,par[7]);
+  }
+  return (f);
+}
+
+
+# if (0)
 /* one component, two slopes: (1 + z^M + z^N)^(-1) -- x, y, sx, sy, sxy, I, sky, sr */
 float qrgaussTD (float x, float y, float *par, int Npar, float *dpar) {
@@ -76 +108 @@
   return (f);
 }
-
+# endif