Changeset 28218 for trunk/ppTranslate/src/ppMopsRead.c

Timestamp:

Jun 4, 2010, 10:44:09 AM (16 years ago)

Author:

Paul Price

Message:

Bug fixes to get it working. Seems a bit slow, but it's working.

File:

• trunk/ppTranslate/src/ppMopsRead.c (modified) (2 diffs)

trunk/ppTranslate/src/ppMopsRead.c

@@ -68 +68 @@
         psFitsClose(fits);
 
-        det->ra = psMemIncrRefCounter(psMetadataLookupVector(NULL, table, "RA_PSF"));
-        det->dec = psMemIncrRefCounter(psMetadataLookupVector(NULL, table, "DEC_PSF"));
+        psVector *ra = psMetadataLookupVector(NULL, table, "RA_PSF");
+        psVector *dec = psMetadataLookupVector(NULL, table, "DEC_PSF");
+
+        det->ra = (psVector*)psBinaryOp(NULL, ra, "*", psScalarAlloc(DEG_TO_RAD(1.0), PS_TYPE_F64));
+        det->dec = (psVector*)psBinaryOp(NULL, dec, "*", psScalarAlloc(DEG_TO_RAD(1.0), PS_TYPE_F64));
         det->x = psMemIncrRefCounter(psMetadataLookupVector(NULL, table, "X_PSF"));
         det->y = psMemIncrRefCounter(psMetadataLookupVector(NULL, table, "Y_PSF"));
@@ -77 +80 @@
         }
 
-        psTrace("ppMops.read", 2, "Read %ld rows from %s\n", det->ra->n, (const char*)inNames->data[i]);
+        psTrace("ppMops.read", 2, "Read %ld rows from %s\n", det->num, (const char*)inNames->data[i]);
 
         detections->data[i] = det;