Changeset 29060 for branches/sc_branches/trunkTest/Ohana/src/relastro/include/relastro.h

Timestamp:

Aug 26, 2010, 9:18:39 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Merging trunk in branch

Location:

branches/sc_branches/trunkTest

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/relastro/include/relastro.h (modified) (7 diffs)

branches/sc_branches/trunkTest/Ohana/src/relastro/include/relastro.h

@@ -3 +3 @@
 # include <kapa.h>
 # include <signal.h>
+# include <assert.h>
 
 typedef enum {
@@ -76 +77 @@
   int    Nmeas;
 } StatType;
+
+# define MARKTIME(MSG,...) { \
+  float dtime; \
+  gettimeofday (&stop, (void *) NULL); \
+  dtime = DTIME (stop, start); \
+  fprintf (stderr, MSG, __VA_ARGS__); }
 
 /* global variables set in parameter file */
@@ -145 +152 @@
 int DoUpdateChips;
 int DoUpdateMosaics;
+
+// StarMap parameters:
+int NX_MAP;
+int NY_MAP;
+double DPOS_MAX;
+double ADDSTAR_RADIUS;
 
 /*** relphot prototypes ***/
@@ -207 +220 @@
 void create_image_db (FITS_DB *db);
 void save_catalogs (Catalog *catalog, int Ncatalog);
+
+int reload_images (FITS_DB *db);
 
 int           main                PROTO((int argc, char **argv));
@@ -267 +282 @@
 double **poly2d_copy (double **poly, int Nx, int Ny);
 double poly2d_eval (double **poly, int Nx, int Ny, double x, double y);
-int fit_apply_coords (CoordFit *fit, Coords *coords);
+int fit_apply_coords (CoordFit *fit, Coords *coords, int keepRef);
 int CoordsGetCenter (CoordFit *fit, double tol, double *xo, double *yo);
 CoordFit *CoordsSetCenter (CoordFit *input, double Xo, double Yo);
-int FitChip (StarData *raw, StarData *ref, int Nmatch, Coords *coords);
+int FitChip (StarData *raw, StarData *ref, int Nmatch, Image *image);
 void FitMosaic (StarData *raw, StarData *ref, int Nmatch, Coords *coords);
 void FitSimple (StarData *raw, StarData *ref, int Nmatch, Coords *coords);
@@ -293 +308 @@
 StarData *getImageRef (Catalog *catalog, int Ncatalog, off_t im, off_t *Nstars, CoordMode mode);
 StarData *getImageRaw (Catalog *catalog, int Ncatalog, off_t im, off_t *Nstars, CoordMode mode);
+off_t getImageByID (off_t ID);
 
 Mosaic *getmosaics (off_t *N);
@@ -331 +347 @@
 int high_speed_objects (SkyRegion *region, Catalog *catalog);
 int MeasMatchesPhotcode(Measure *measure, PhotCode **photcodeSet, int Nset);
+
+int initStarMaps ();
+int updateStarMaps(Catalog *catalog);
+int createStarMapPoints();
+int checkStarMap(int N);