Changeset 33446

Timestamp:

Mar 9, 2012, 7:05:32 AM (14 years ago)

Author:

eugene

Message:

clean up the tiny value stuff, put support functions in libdvo; would benefit from autocoding, esp for BrightCatalog stuff

Location:

branches/eam_branches/ipp-20111122/Ohana/src/libdvo

Files:

• Makefile (modified) (1 diff)
• include/dvo.h (modified) (2 diffs)
• src/dvo_tiny_values.c (added)

branches/eam_branches/ipp-20111122/Ohana/src/libdvo/Makefile

@@ -52 +52 @@
 $(SRC)/mosaic_astrom.$(ARCH).o   \
 $(SRC)/fits_db.$(ARCH).o         \
+$(SRC)/dvo_tiny_values.$(ARCH).o       \
 $(SRC)/dvo_image.$(ARCH).o       \
 $(SRC)/dvo_image_raw.$(ARCH).o   \

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

@@ -269 +269 @@
 } PhotCodeData;
 
-// a reduced-subset structure for relastro
-typedef struct {
-  double         R;
-  double         D;
-  unsigned short Nmeasure;
-  int            measureOffset;
-  uint32_t       flags;
-  int            catID;
-} AverageTinyAstro;
+typedef enum {
+  DVO_TV_MEASURE = 0x01,
+  DVO_TV_AVERAGE = 0x02,
+} DVOTinyValueMode;
+
+// XXX DROP? // a reduced-subset structure for relastro
+// XXX DROP? typedef struct {
+// XXX DROP?   double         R;
+// XXX DROP?   double         D;
+// XXX DROP?   unsigned short Nmeasure;
+// XXX DROP?   int            measureOffset;
+// XXX DROP?   uint32_t       flags;
+// XXX DROP?   int            catID;
+// XXX DROP? } AverageTinyAstro;
 
 // a reduced-subset structure for relphot
@@ -609 +614 @@
 int HostTableWaitJobs (HostTable *table, char *file, int lineno);
 
-# endif
+// functions to support tiny versions of Average and Measure
+void CopyAverageToTiny (AverageTiny *averageT, Average *average);
+void CopyMeasureToTiny (MeasureTiny *measureT, Measure *measure);
+int populate_tiny_values (Catalog *catalog, DVOTinyValueMode mode);
+int free_tiny_values (Catalog *catalog);
+
+# endif // DVO_H
+