Changeset 32055 for branches/eam_branches/ipp-20110710/Ohana/src/relastro/include/relastro.h

Timestamp:

Aug 9, 2011, 12:25:01 PM (15 years ago)

Author:

eugene

Message:

add merge-source mode; modified getimages API to avoid a wasteful copy of the image table; fix the parallax measurement

File:

• branches/eam_branches/ipp-20110710/Ohana/src/relastro/include/relastro.h (modified) (4 diffs)

branches/eam_branches/ipp-20110710/Ohana/src/relastro/include/relastro.h

@@ -15 +15 @@
 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, TARGET_HIGH_SPEED} FitTarget;
+typedef enum {TARGET_NONE, TARGET_OBJECTS, TARGET_SIMPLE, TARGET_CHIPS, TARGET_MOSAICS, TARGET_HIGH_SPEED, TARGET_MERGE_SOURCE} FitTarget;
 
 typedef struct {
@@ -94 +94 @@
 char   SKY_TABLE[256];
 int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
+
+unsigned int OBJ_ID_SRC;
+unsigned int CAT_ID_SRC;
+unsigned int OBJ_ID_DST;
+unsigned int CAT_ID_DST;
 
 double SIGMA_LIM;
@@ -210 +215 @@
 void          getfullregion       PROTO((Image *image, off_t Nimage, GSCRegion *fullregion));
 Image        *getimage            PROTO((off_t N));
-Image        *getimages           PROTO((off_t *N));
+Image        *getimages           PROTO((off_t *N, off_t **line_number));
 void          global_stats        PROTO((Catalog *catalog, int Ncatalog));
 void          initGrid            PROTO((int dX, int dY));
 void          initGridBins        PROTO((Catalog *catalog, int Ncatalog));
 void          initImageBins       PROTO((Catalog *catalog, int Ncatalog, int FULLINIT));
-void          initImages          PROTO((Image *input, off_t N));
+void          initImages          PROTO((Image *input, off_t *line_number, off_t N));
 void          initMosaicBins      PROTO((Catalog *catalog, int Ncatalog));
 void          initMosaicGrid      PROTO((Image *image, off_t Nimage));
@@ -372 +377 @@
 int applyConstraintsB(Catalog *catalog, off_t i);
 void setupAreaSelection(SkyRegion *region);
+
+int relastro_merge_source ();
+void resort_catalog (Catalog *catalog);