Changeset 8241 for trunk/Ohana/src/gastro2/include/gastro2.h

Timestamp:

Aug 8, 2006, 3:50:18 PM (20 years ago)

Author:

eugene

Message:

substantial work to correctly handle higher order polynomial.
conversions between the internal fitting model (R = sum (Aij x^{i y}j))
and the header representation were incorrect: they did not correctly
handle the shift to the CRPIXi value (ie, x -> (x - xo)). i fixed this
by making the fit explicitly work on the fit to the tangent-plane
coordinates, instead of fitting corrections, and calculating the correct
change of polynomial coefficients. this is not as simple as it seems at
first glance: the header version of the coefficients does not have a
zero-order term, and instead has the CRPIX value. to convert from one to
the other requires solving the equation L(Xo,Yo),M(Xo,Yo) = (0,0). I do
this using the Newton-Raphson method.

File:

• trunk/Ohana/src/gastro2/include/gastro2.h (modified) (4 diffs)

trunk/Ohana/src/gastro2/include/gastro2.h

@@ -3 +3 @@
 
 typedef struct {
-  double R;
-  double D;
-  double X;
-  double Y;
-  double M;
-  double dM;
+  double R, D;
+  double P, Q;
+  double X, Y;
+  double M, dM;
   int type;
 } StarData;
-
-# if (0)
-typedef struct {
-  float X;
-  float Y;
-  float M;
-  float dM;
-  float Mgal;
-  float Map;
-  float sky;
-  float fx;
-  float fy;
-  float df;
-  char  dophot;
-  char  dummy[3];
-} Stars;
-# endif
 
 typedef struct {
@@ -129 +110 @@
 double MAGLIM_MIN;
 double MAGLIM_MAX;
-
+int NGRID_PIX;
+
+int    ASCA;
 int    FORCE;
 double F_RA;
@@ -173 +156 @@
 void      fit_lum_bin (double *x, double *y, int N, double *C0, double *C1);
 void      fit_norm (); 
-double    fit_scat (StarData *st, StarData *sr);
+double    fit_scat (StarData *st, StarData *sr, Coords *coords);
 int       gaussj (double **a, int n, double **b, int m);
 void      gcenter (CmpCatalog *Target, RefCatalog *Ref);
@@ -209 +192 @@
 void      plot_init_gridplot ();
 void      plot_lumfunc (CmpCatalog *Target, RefCatalog *Ref);
-void      plot_resid (StarData *st, StarData *sr);
+void      plot_resid (StarData *st, StarData *sr, Coords *coords);
 void      plot_resid_init (int version, double xmax);
 void      plot_resid_plot (int version, float *xvect, float *yvect, int Nvect);