Index: trunk/Ohana/src/gastro2/include/gastro2.h
===================================================================
--- trunk/Ohana/src/gastro2/include/gastro2.h	(revision 7997)
+++ trunk/Ohana/src/gastro2/include/gastro2.h	(revision 8241)
@@ -3,29 +3,10 @@
 
 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,5 +110,7 @@
 double MAGLIM_MIN;
 double MAGLIM_MAX;
-
+int NGRID_PIX;
+
+int    ASCA;
 int    FORCE;
 double F_RA;
@@ -173,5 +156,5 @@
 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,5 +192,5 @@
 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);