Changeset 34041 for branches/meh_branches/ppstack_test/Ohana/src/uniphot/include/uniphot.h

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/uniphot/include/uniphot.h (modified) (5 diffs)

branches/meh_branches/ppstack_test/Ohana/src/uniphot/include/uniphot.h

@@ -66 +66 @@
 char         STATMODE[64];
 int          VERBOSE;
+int          UBERCAL; // load the supplied ubercal zero point fits table (with flat-field corrections)
+int          NO_METADATA; // the supplied ubercal data has no descriptive metadata
 int          NLOOP;
 int          TimeSelect;
@@ -95 +97 @@
 void          XDead               PROTO((void));
 int           args_uniphot        PROTO((int argc, char **argv));
-int           args_setphot        PROTO((int argc, char **argv));
 void          dumpresult          PROTO((void));
 Group        *find_image_sgroups  PROTO((FITS_DB *db, ImageLink **imlink, int *Nsgroup));
@@ -103 +104 @@
 int           gcatalog            PROTO((Catalog *catalog));
 void          initialize_uniphot  PROTO((int argc, char **argv));
-void          initialize_setphot  PROTO((int argc, char **argv));
 void          initstats           PROTO((char *mode));
 int           liststats           PROTO((double *value, double *dvalue, int N, StatType *stats));
 int           load_images_uniphot PROTO((FITS_DB *db));
+Image        *load_images_setfwhm PROTO((FITS_DB *db, off_t *Nimage));
 int           main                PROTO((int argc, char **argv));
 int           open_graph          PROTO((int N));
@@ -112 +113 @@
 void          sortB               PROTO((double *X, double *Y, int N));
 void          sortD               PROTO((double *X, double *Y, double *Z, int N));
-void          update_dvo_catalog  PROTO((Catalog *catalog, Group *sgroup, int warn));
 void          wcatalog            PROTO((Catalog *catalog));
 void          wimages             PROTO((Image *image, int Nimage));
@@ -125 +125 @@
 int           SetSignals          PROTO((void));
 int           subset_images       PROTO((FITS_DB *db));
-void          update              PROTO((FITS_DB *db, Group *sgroup, int Nsgroup));
+void          update_dvo_uniphot  PROTO((FITS_DB *db, Group *sgroup, int Nsgroup));
+void          update_catalog_uniphot PROTO((Catalog *catalog, Group *sgroup, int warn));
 void          sort_time           PROTO((unsigned int *value, int N));
 
-// setphot-specific prototypes
-ZptTable     *load_zpt_table         PROTO((char *filename, int *nzpts));
-Image        *load_images_setphot    PROTO((FITS_DB *db, off_t *Nimage));
-int           match_zpts_to_images   PROTO((Image *image, off_t Nimage, ZptTable *zpts, int Nzpts));
-int           update_setphot         PROTO((Image *image, off_t Nimage));
-void          update_catalog_setphot PROTO((Catalog *catalog, Image *image, off_t *index, off_t Nimage));
-
-/*** time/coord conversion functions not supplied by libohana ***/
-time_t        TimeRef               PROTO((double time, time_t TimeReference, int TimeFormat));
-double        TimeValue             PROTO((time_t time, time_t TimeReference, int TimeFormat));
-
-int           hh_hms                PROTO((double hh, int *hr, int *mn, double *sc));
-int           dd_dms                PROTO((double dd, int *dg, int *mn, double *sc));
-int           hms_format            PROTO((char *line, double value));
-int           dms_format            PROTO((char *line, double value));
-int           hh_hm                 PROTO((double hh, int *hr, double *mn));
-int           day_to_sec            PROTO((char *string, time_t *second));
-int           hms_to_sec            PROTO((char *string, time_t *second));
-char         *ohana_sec_to_hms      PROTO((time_t second));
-char         *ohana_sec_to_day      PROTO((time_t second));
-
-char         *meade_deg_to_str      PROTO((double deg));
-char         *meade_ra_to_str       PROTO((double deg));
-char         *meade_dec_to_str      PROTO((double deg));
-char         *strptime              PROTO((const char *s, const char *format, struct tm *tm));
 time_t        GetTimeReference      PROTO((char *reference));
 int           GetTimeUnits          PROTO((char *name));