Index: /trunk/Ohana/src/relastro/include/relastro.h
===================================================================
--- /trunk/Ohana/src/relastro/include/relastro.h	(revision 17214)
+++ /trunk/Ohana/src/relastro/include/relastro.h	(revision 17215)
@@ -11,4 +11,8 @@
 
 typedef enum {ERROR_MODE_RA, ERROR_MODE_DEC, ERROR_MODE_POS} ErrorMode;
+
+typedef enum {FIT_NONE, FIT_AVERAGE, FIT_PM_ONLY, FIT_PAR_ONLY, FIT_PM_AND_PAR} FitMode;
+
+typedef enum {TARGET_NONE, TARGET_OBJECTS, TARGET_SIMPLE, TARGET_CHIPS, TARGET_MOSAICS} FitTarget;
 
 typedef struct {
@@ -75,25 +79,16 @@
 /* global variables set in parameter file */
 char   ImageCat[256];
-char   ImageTemplate[256];
-char   CatTemplate[256];
 char   GSCFILE[256];
 char   CATDIR[256];
 char   CATMODE[16];    /* raw, mef, split, mysql */
 char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
-char   CameraConfig[256];
 char   SKY_TABLE[256];
 int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
 
-double MAG_LIM;
 double SIGMA_LIM;
-double IMAGE_SCATTER;
-double IMAGE_OFFSET;
-double STAR_SCATTER;
-double STAR_CHISQ;
 double MIN_ERROR;
 
 int    VERBOSE;
 
-int    NLOOP;
 int    RESET;
 int    UPDATE;
@@ -101,28 +96,14 @@
 int    SAVEPLOT;
 int    SHOW_PARAMS;
-char   MOSAICNAME[256];
 char   STATMODE[32];
-int    STAR_BAD;
-int    MEAS_BAD;
 int    POS_TOOFEW;
 int    PM_TOOFEW;
 double PM_DT_MIN;
-int    IMAGE_TOOFEW;
-double IMAGE_GOOD_FRACTION;
-int    IMAGE_BAD;
-int    FREEZE_IMAGES;
-int    USE_GRID;
 int    PLOTDELAY;
 int    CHIPORDER;
 
-int    RELPHOT_GRID_X;
-int    RELPHOT_GRID_Y;
-int    RELPHOT_GRID_BINNING;
-
-char          *PHOTCODE_LIST;
-int           Nphotcodes;
-PhotCode     **photcodes;
-int            PhotPrimary;
-int            PhotNsec;
+char          *PHOTCODE_KEEP_LIST, *PHOTCODE_SKIP_LIST;
+int           NphotcodesKeep,      NphotcodesSkip;
+PhotCode     **photcodesKeep,     **photcodesSkip;
 
 int AreaSelect;
@@ -132,17 +113,14 @@
 
 double  PlotMmin, PlotMmax, PlotdMmin, PlotdMmax;
-enum {black, white, red, orange, yellow, green, blue, indigo, violet};
 
 int DophotSelect, DophotValue;
-int PhotFlagSelect, PhotFlagValue;
+int PhotFlagSelect, PhotFlagPoor, PhotFlagBad;
 
 int TimeSelect;
 time_t TSTART, TSTOP;
 
-int FIT_MODE;
-enum {FIT_NONE, FIT_AVERAGE, FIT_PM_ONLY, FIT_PAR_ONLY, FIT_PM_AND_PAR};
-
-int FIT_TARGET;
-enum {TARGET_NONE, TARGET_OBJECTS, TARGET_SIMPLE, TARGET_CHIPS, TARGET_MOSAICS};
+FitMode FIT_MODE;
+
+FitTarget FIT_TARGET;
 
 SkyRegion UserPatch;
@@ -309,2 +287,4 @@
 int setMeanR (double ra_fit, Measure *measure, Average *average, SecFilt *secfilt);
 int setMeanD (double dec_fit, Measure *measure, Average *average, SecFilt *secfilt);
+
+float GetAstromError (Measure *measure, int mode);