Index: /trunk/Ohana/src/libdvo/include/dvo_util.h
===================================================================
--- /trunk/Ohana/src/libdvo/include/dvo_util.h	(revision 26403)
+++ /trunk/Ohana/src/libdvo/include/dvo_util.h	(revision 26404)
@@ -30,4 +30,7 @@
 typedef struct {
     int         valid;
+    Average     ave;
+    Measure     meas;
+#ifdef notdef
     int         objID;
     int         catID;
@@ -35,5 +38,9 @@
     uint64_t    pspsObjID;
     uint64_t    pspsDetID;
+#endif
 } dvoDetection;
+
+#define PSPS_OBJID(_d) (_d->ave.extID)
+#define PSPS_DETID(_d) (_d->meas.extID)
 
 // dvoConfigRead
Index: /trunk/Ohana/src/libdvo/src/dvo_util.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/dvo_util.c	(revision 26403)
+++ /trunk/Ohana/src/libdvo/src/dvo_util.c	(revision 26404)
@@ -61,9 +61,4 @@
         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,4 +240,7 @@
 
         det->valid     = 1;
+        det->ave      = *a;
+        det->meas     = *m;
+#ifdef notdfe
         det->objID     = a->objID;
         det->catID     = m->catID;
@@ -250,7 +248,8 @@
         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,5 +267,5 @@
       int i;
       for (i = 0; i < Ndetect; i++) {
-           sorted[detections[i].detID] = detections[i];
+           sorted[detections[i].meas.detID] = detections[i];
       }
       *results = sorted;