Index: trunk/Ohana/src/mosastro/include/mosastro.h
===================================================================
--- trunk/Ohana/src/mosastro/include/mosastro.h	(revision 3416)
+++ trunk/Ohana/src/mosastro/include/mosastro.h	(revision 3466)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <loneos.h>
+# include <dvo.h>
 
 typedef struct {
@@ -73,4 +73,20 @@
 } Stars;
 
+typedef struct {
+  double Rraw, Draw; /* Sky Coords    - degrees */
+  float Praw, Qraw;  /* Tangent Plane - pixels  */
+  float Lraw, Mraw;  /* Focal Plane   - pixels  */
+  float Xraw, Yraw;  /* Chip Coords   - pixels  */
+
+  double Rref, Dref; /* Sky Coords    - degrees */
+  float Pref, Qref;  /* Tangent Plane - pixels  */
+  float Lref, Mref;  /* Focal Plane   - pixels  */
+  float Xref, Yref;  /* Chip Coords   - pixels  */
+
+  float Mcat, dMcat;
+  float Minst, dMinst;
+  char mask;
+} MatchData;
+
 int  ChipOrder;
 int  Nchip;
@@ -81,4 +97,8 @@
 double SIGMA;
 double SIGMA_LIM;
+double IMAG_MIN;
+double IMAG_MAX;
+double INST_BRIGHT;
+double ZERO_POINT;
 
 char StoneRegions[256];
@@ -95,4 +115,5 @@
 int VERBOSE;
 int NO_CHIPS;
+int SAVE_RESID;
 
 char GSCFILE[256];
@@ -116,5 +137,5 @@
 StarData *gcatalog (char *filename, int *Nstars);
 StarData *gptolemy (char *filename, int *NSTARS);
-double GetScatter ();
+double GetScatter (int *Nscatter, double *DL, double *DM, int bright);
 int find_dec_bands (CatStats *area);
 int load_ra_blocks (int Ndec, CatStats *area);
@@ -178,2 +199,6 @@
 void wstars (char *filename, Stars *stars, int Nstars, Header *header);
 int ConvertStars (Stars *data, int size, int nitems);
+int rfits (Chip *mychip);
+int rtext (Chip *mychip);
+void wfits (char *filename, Stars *stars, int Nstars, Header *header);
+int ConvertMatch (MatchData *data, int size, int nitems);