Changeset 25027 for branches/pap/Ohana/src/libdvo/include/dvo.h

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

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

branches/pap/Ohana/src/libdvo/include/dvo.h

@@ -19 +19 @@
               DVO_FORMAT_PS1_DEV_2,
               DVO_FORMAT_PS1_DEV_3,
-              DVO_FORMAT_PS1_V1
+              DVO_FORMAT_PS1_V1,
+              DVO_FORMAT_PS1_REF
 } DVOTableFormat;
 
@@ -108 +109 @@
 # define ID_MEAS_POOR_ASTROM  0x0010  /* detection is astrometry outlier                                             */   
 # define ID_MEAS_SKIP_ASTROM  0x0020  /* detection was ignored for astrometry measurement                            */   
-# define ID_MEAS_UNDEF_1      0x0040  /* unused                                                                      */
-# define ID_MEAS_UNDEF_2      0x0080  /* unused                                                                      */
+# define ID_MEAS_USED_OBJ     0x0040  /* detection was used during opdate objects                                    */
+# define ID_MEAS_USED_CHIP    0x0080  /* detection was used during update chips                                      */
 # define ID_MEAS_BLEND_MEAS   0x0100  /* detection is within radius of multiple objects                              */
 # define ID_MEAS_BLEND_OBJ    0x0200  /* multiple detections within radius of object                                 */
@@ -185 +186 @@
 } SkyList;
 
+// special-case function:
+CMF_PS1_V2 *gfits_table_get_CMF_PS1_V1_Alt (FTable *ftable, int *Ndata, int *swapped);
+
 # if (0)
 /* structure for data on a catalog region */
@@ -307 +311 @@
 float PhotInst (Measure *measure);
 float PhotCat (Measure *measure);
+float PhotAper (Measure *measure);
 float PhotSys (Measure *measure, Average *average, SecFilt *secfilt);
 float PhotRel (Measure *measure, Average *average, SecFilt *secfilt);
@@ -409 +414 @@
 # include "ps1_dev_3_defs.h"
 # include "ps1_v1_defs.h"
+# include "ps1_ref_defs.h"
 
 /*** DVO image db I/O Functions ***/
@@ -436 +442 @@
 SkyList   *SkyListByBounds         PROTO((SkyTable *table, int depth, double Rmin, double Rmax, double Dmin, double Dmax));
 SkyList   *SkyListChildrenByBounds PROTO((SkyTable *table, int No, int depth, double Rmin, double Rmax, double Dmin, double Dmax));
+
 int        SkyListMerge            PROTO((SkyList **outlist, SkyList *newlist));
 int        SkyListFree             PROTO((SkyList *list));
@@ -442 +449 @@
 int        SkyTableSetFilenames    PROTO((SkyTable *sky, char *path, char *ext));
 
+SkyList   *SkyRegionByPoint_List   PROTO((SkyList *inList, int depth, double ra, double dec));
+SkyList   *SkyListByBounds_List    PROTO((SkyList *table, int depth, double Rmin, double Rmax, double Dmin, double Dmax));
+SkyList   *SkyListChildrenByBounds_List PROTO((SkyList *table, int depth, double Rmin, double Rmax, double Dmin, double Dmax));
+
 /* dvo-specific sorting functions */
 void sortave (Average *ave, int N);