Changeset 16810 for trunk/Ohana/src/relastro/include/relastro.h

Timestamp:

Mar 4, 2008, 12:39:41 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080223 : updates to DVO output format, addstar (SDSS and 2MASS flags), relastro (FitChip)

File:

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

trunk/Ohana/src/relastro/include/relastro.h

@@ -10 +10 @@
 } CoordMode;
 
+typedef enum {ERROR_MODE_RA, ERROR_MODE_DEC, ERROR_MODE_POS} ErrorMode;
+
 typedef struct {
   double R, D;  /* Sky Coords    - degrees */
@@ -15 +17 @@
   double L, M;  /* Focal Plane   - pixels  */
   double X, Y;  /* Chip Coords   - pixels  */
-  double Mag, dMag;
+  double Mag;
+  double dMag;
+  double dPos;
   int mask;
 } StarData;
@@ -263 +267 @@
 void fit_add (CoordFit *fit, double x1, double y1, double x2, double y2, double wt);
 void fit_eval (CoordFit *fit);
+void fit_apply (CoordFit *fit, double *x2, double *y2, double x1, double y1);
 double **poly2d_dx (double **poly, int Nx, int Ny);
 double **poly2d_dy (double **poly, int Nx, int Ny);
 double **poly2d_copy (double **poly, int Nx, int Ny);
 double poly2d_eval (double **poly, int Nx, int Ny, double x, double y);
-void fit_apply_coords (CoordFit *fit, Coords *coords);
+CoordFit *fit_apply_coords (CoordFit *fit, Coords *coords);
 int CoordsGetCenter (CoordFit *fit, double tol, double *xo, double *yo);
 CoordFit *CoordsSetCenter (CoordFit *input, double Xo, double Yo);
@@ -278 +283 @@
 int UpdateChips (Catalog *catalog, int Ncatalog);
 int UpdateMosaic (Catalog *catalog, int Ncatalog);
+int UpdateMeasures (Catalog *catalog, int Ncatalog);
+void fixImageRaw (Catalog *catalog, int Ncatalog, int im);
+
 int sun_ecliptic (double jd, double *lambda, double *beta, double *epsilon);
 int ParFactor (double *pR, double *pD, double R, double D, time_t T);