Changeset 31657 for branches/eam_branches/ipp-20110505/Ohana/src/libdvo/include/dvo.h

Timestamp:

Jun 21, 2011, 6:45:51 PM (15 years ago)

Author:

eugene

Message:

merge from trunk

File:

• branches/eam_branches/ipp-20110505/Ohana/src/libdvo/include/dvo.h (modified) (3 diffs)

branches/eam_branches/ipp-20110505/Ohana/src/libdvo/include/dvo.h

@@ +1 @@
+# ifndef DVO_H
+# define DVO_H
+
 # include <ohana.h>
 # include <gfitsio.h>
 # include <autocode.h>
 
-# ifndef DVO_H
-# define DVO_H
+# include <libdvo_astro.h>
+# include <dvodb.h>
 
 /* DVO table modes */
@@ -506 +509 @@
 SkyList   *SkyListChildrenByBounds_List PROTO((SkyList *table, int depth, double Rmin, double Rmax, double Dmin, double Dmax));
 
+int set_skyregion(double Rs, double Re, double Ds, double De);
+int get_skyregion (double *Rs, double *Re, double *Ds, double *De);
+
+void dvo_set_catdir(char *catdir);
+char *dvo_get_catdir();
+
 /* dvo-specific sorting functions */
 void sortave (Average *ave, off_t N);
@@ -513 +522 @@
 void sort_regions (SkyRegion *region, off_t N);
 
+#ifdef MOVED_TO_LIBOHANA
+int  print_error(void);
+int  init_error(void);
+int  push_error(char *);
+#endif
+
 # endif