Changeset 26404

Timestamp:

Dec 14, 2009, 2:56:37 PM (16 years ago)

Author:

bills

Message:

Forget trying to pick and choose which values we return.
Include the Measure and Average in dvoDetection.

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo_util.h (modified) (2 diffs)
• src/dvo_util.c (modified) (4 diffs)

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

@@ -30 +30 @@
 typedef struct {
     int         valid;
+    Average     ave;
+    Measure     meas;
+#ifdef notdef
     int         objID;
     int         catID;
@@ -35 +38 @@
     uint64_t    pspsObjID;
     uint64_t    pspsDetID;
+#endif
 } dvoDetection;
+
+#define PSPS_OBJID(_d) (_d->ave.extID)
+#define PSPS_DETID(_d) (_d->meas.extID)
 
 // dvoConfigRead

trunk/Ohana/src/libdvo/src/dvo_util.c

@@ -61 +61 @@
         dvoConfig->skyTableFile[0] = 0;
     }
-
-#ifdef notdef
-  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
-  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
-#endif
 
     sprintf (dvoConfig->photcodeFile, "%s/Photcodes.dat", dvoConfig->catdir);
@@ -245 +240 @@
 
         det->valid     = 1;
+        det->ave      = *a;
+        det->meas     = *m;
+#ifdef notdfe
         det->objID     = a->objID;
         det->catID     = m->catID;
@@ -250 +248 @@
         det->pspsObjID = a->extID;
         det->pspsDetID = m->extID;
+#endif
         
-        if (det->detID > *pMaxDetID) {
-            *pMaxDetID = det->detID;
+        if ((int) det->meas.detID > *pMaxDetID) {
+            *pMaxDetID = det->meas.detID;
         }
 
@@ -268 +267 @@
       int i;
       for (i = 0; i < Ndetect; i++) {
-           sorted[detections[i].detID] = detections[i];
+           sorted[detections[i].meas.detID] = detections[i];
       }
       *results = sorted;