Changeset 31668 for trunk/Ohana/src/relphot/include/relphot.h

Timestamp:

Jun 22, 2011, 12:43:18 AM (15 years ago)

Author:

eugene

Message:

merged from eam/ipp20110505: various memory and speed improvements; fixed 0 cloud issue

File:

• trunk/Ohana/src/relphot/include/relphot.h (modified) (5 diffs)

trunk/Ohana/src/relphot/include/relphot.h

@@ -63 +63 @@
 int    RESET;
 int    UPDATE;
+int    SAVE_IMAGE_UPDATES;
 int    PLOTSTUFF;
 int    SAVEPLOT;
@@ -139 +140 @@
 void          dump_grid           PROTO((void)); 
 int           edge_check          PROTO((double *x1, double *y1, double *x2, double *y2));
-void          findImages          PROTO((Catalog *catalog, int Ncatalog));
-int           findMosaics         PROTO((Catalog *catalog, int Ncatalog));
+void          findImages          PROTO((Catalog *catalog, int Ncatalog, int doImageList));
+int           findMosaics         PROTO((Catalog *catalog, int Ncatalog, int doMosaicList));
 
 void set_db (FITS_DB *in);
@@ -149 +150 @@
 
 void          freeGridBins        PROTO((int Ncatalog));
-void          freeImageBins       PROTO((int Ncatalog));
-void          freeMosaicBins      PROTO((int Ncatalog));
+void          freeImageBins       PROTO((int Ncatalog, int doImageList));
+void          freeMosaicBins      PROTO((int Ncatalog, int doMosaicList));
 void          free_catalogs       PROTO((Catalog *catalog, int Ncatalog));
 int           gcatalog            PROTO((Catalog *catalog, int FINAL));
@@ -160 +161 @@
 float         getMrel             PROTO((Catalog *catalog, off_t meas, int cat));
 Image        *getimage            PROTO((off_t N));
-Image        *getimages           PROTO((off_t *N));
+Image        *getimages           PROTO((off_t *N, off_t **LineNumber));
 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));
-void          initImages          PROTO((Image *input, off_t N));
-void          initMosaicBins      PROTO((Catalog *catalog, int Ncatalog));
+void          initImageBins       PROTO((Catalog *catalog, int Ncatalog, int doImageList));
+void          initImages          PROTO((Image *input, off_t *LineNumber, off_t N));
+void          initMosaicBins      PROTO((Catalog *catalog, int Ncatalog, int doMosaicList));
 void          initMosaicGrid      PROTO((Image *image, off_t Nimage));
 void          initMosaics         PROTO((Image *image, off_t Nimage));
@@ -179 +180 @@
 int           main                PROTO((int argc, char **argv));
 void          mark_images         PROTO((Image *image, off_t Nimage, Image *timage, off_t Ntimage));
-void          matchImage          PROTO((Catalog *catalog, off_t meas, int cat));
-void          matchMosaics        PROTO((Catalog *catalog, off_t meas, int cat));
+void          matchImage          PROTO((Catalog *catalog, off_t meas, int cat, int doImageList));
+void          matchMosaics        PROTO((Catalog *catalog, off_t meas, int cat, int doMosaicList));
 double        opening_angle       PROTO((double x1, double y1, double x2, double y2, double x3, double y3));
 void          plot_chisq          PROTO((Catalog *catalog, int Ncatalog));