Changeset 25186 for branches/pap_mops/ppMops/src/ppMopsRead.c

Timestamp:

Aug 25, 2009, 1:15:07 PM (17 years ago)

Author:

Paul Price

Message:

Fix types (differed between reading, writing and using). Fix units for ra,dec (should be radians internally, for trig functions).

File:

• branches/pap_mops/ppMops/src/ppMopsRead.c (modified) (4 diffs)

branches/pap_mops/ppMops/src/ppMopsRead.c

@@ -77 +77 @@
             det->x->data.F32[j] = psMetadataLookupF32(NULL, row, "X_PSF");
             det->y->data.F32[j] = psMetadataLookupF32(NULL, row, "Y_PSF");
-            det->ra->data.F32[j] = psMetadataLookupF32(NULL, row, "RA_PSF");
-            det->dec->data.F32[j] = psMetadataLookupF32(NULL, row, "DEC_PSF");
-            det->mag->data.F32[j] = psMetadataLookupF32(NULL, row, "Y_PSF");
-            det->magErr->data.F32[j] = psMetadataLookupF32(NULL, row, "Y_PSF");
+            det->ra->data.F64[j] = DEG_TO_RAD(psMetadataLookupF64(NULL, row, "RA_PSF"));
+            det->dec->data.F64[j] = DEG_TO_RAD(psMetadataLookupF64(NULL, row, "DEC_PSF"));
+            det->mag->data.F32[j] = psMetadataLookupF32(NULL, row, "PSF_INST_MAG");
+            det->magErr->data.F32[j] = psMetadataLookupF32(NULL, row, "PSF_INST_MAG_SIG");
             det->extended->data.F32[j] = psMetadataLookupF32(NULL, row, "EXT_NSIGMA");
             det->angle->data.F32[j] = 0.0;
@@ -86 +86 @@
             det->length->data.F32[j] = 0.0;
             det->lengthErr->data.F32[j] = 0.0;
-            det->flags->data.F32[j] = psMetadataLookupU32(NULL, row, "FLAGS");
+            det->flags->data.U32[j] = psMetadataLookupU32(NULL, row, "FLAGS");
             det->diffSkyfileId->data.F32[j] = diffSkyfileId;
             det->naxis1->data.S32[j] = naxis1;
@@ -103 +103 @@
             double xErr2 = PS_SQR(xErr), yErr2 = PS_SQR(yErr);
             double errScale = scale / 3600.0;
-            det->raErr->data.F32[j] = errScale * sqrt(cosAngle2 * xErr2 + sinAngle2 * yErr2);
-            det->decErr->data.F32[j] = errScale * sqrt(sinAngle2 * xErr2 + cosAngle2 * yErr2);
+            det->raErr->data.F64[j] = errScale * sqrt(cosAngle2 * xErr2 + sinAngle2 * yErr2);
+            det->decErr->data.F64[j] = errScale * sqrt(sinAngle2 * xErr2 + cosAngle2 * yErr2);
 
             plateScale += scale;
@@ -110 +110 @@
         det->seeing *= plateScale / size;
 
+        if (isfinite(args->zp)) {
+            psBinaryOp(det->mag, det->mag, "+", psScalarAlloc(args->zp, PS_TYPE_F32));
+        }
+
         psFree(table);
         detections->data[i] = det;
     }
 
+
     return detections;
 }