Changeset 39041 for trunk/Ohana/src/libdvo

Timestamp:

Nov 5, 2015, 1:04:07 PM (11 years ago)

Author:

eugene

Message:

add zero point keyword option for diffs; add flag for best object; set best object flag in relphot

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• include/dvodb.h (modified) (1 diff)
• src/dbExtractAverages.c (modified) (1 diff)
• src/dbFields.c (modified) (1 diff)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -191 +191 @@
   ID_OBJ_SUSPECT_STACK = 0x20000000, // suspect object in the stack (> 1 good or suspect stack, < 2 good)
   ID_OBJ_BAD_STACK     = 0x40000000, // good-quality object in the stack (> 1 good stack)
+  ID_OBJ_BEST_STACK    = 0x80000000, // the primary stack measurement are the best measurements
 } DVOAverageFlags;
 

trunk/Ohana/src/libdvo/include/dvodb.h

@@ -309 +309 @@
       AVE_NMEAS, 
       AVE_NMISS, 
+      AVE_NLENSING, 
+      AVE_NLENSOBJ, 
+      AVE_NSTARPAR, 
+      AVE_NGALPHOT, 
       AVE_NPOS, 
       AVE_OBJ_FLAGS, 

trunk/Ohana/src/libdvo/src/dbExtractAverages.c

@@ -127 +127 @@
     case AVE_NMISS:
       value.Int = average[0].Nmissing;
+      break;
+    case AVE_NLENSING:
+      value.Int = average[0].Nlensing;
+      break;
+    case AVE_NLENSOBJ:
+      value.Int = average[0].Nlensobj;
+      break;
+    case AVE_NGALPHOT:
+      value.Int = average[0].Ngalphot;
+      break;
+    case AVE_NSTARPAR:
+      value.Int = average[0].Nstarpar;
       break;
     case AVE_NPOS:

trunk/Ohana/src/libdvo/src/dbFields.c

@@ -711 +711 @@
   if (!strcasecmp (fieldName, "NMEAS"))       ESCAPE (AVE_NMEAS,       OPIHI_INT);
   if (!strcasecmp (fieldName, "NMISS"))       ESCAPE (AVE_NMISS,       OPIHI_INT);
+  if (!strcasecmp (fieldName, "NLENSMEAS"))   ESCAPE (AVE_NLENSING,    OPIHI_INT);
+  if (!strcasecmp (fieldName, "NLENSING"))    ESCAPE (AVE_NLENSING,    OPIHI_INT);
+  if (!strcasecmp (fieldName, "NLENSOBJ"))    ESCAPE (AVE_NLENSOBJ,    OPIHI_INT);
+  if (!strcasecmp (fieldName, "NSTARPAR"))    ESCAPE (AVE_NSTARPAR,    OPIHI_INT);
+  if (!strcasecmp (fieldName, "NGALPHOT"))    ESCAPE (AVE_NGALPHOT,    OPIHI_INT);
   if (!strcasecmp (fieldName, "NPOS"))        ESCAPE (AVE_NPOS,        OPIHI_INT);
   if (!strcasecmp (fieldName, "NASTROM"))     ESCAPE (AVE_NPOS,        OPIHI_INT);