Changeset 28243

Timestamp:

Jun 7, 2010, 9:45:30 AM (16 years ago)

Author:

Paul Price

Message:

Split output tables into .hdr and .psf parts (like SMF), and add detection efficiencies. Looks like it's working well now. Sent example to Larry for approval.

Location:

trunk/ppTranslate/src

Files:

• ppMops.h (modified) (2 diffs)
• ppMopsDetections.c (modified) (4 diffs)
• ppMopsRead.c (modified) (6 diffs)
• ppMopsWrite.c (modified) (1 diff)

trunk/ppTranslate/src/ppMops.h

@@ -28 +28 @@
 
 typedef struct {
-    psMetadata *header;                 // FITS header
+    psString component;                 // Component name
+    psMetadata *header;                 // FITS header (extension names *.hdr)
     psString raBoresight, decBoresight; // RA,Dec of telescope boresight
     psString filter;                    // Filter for exposure
@@ -39 +40 @@
     int naxis1, naxis2;                 // Size of image
     long num;                           // Number of detections
+    psMetadata *psfHeader;              // FITS header (extension names *.psf)
     psMetadata *table;                  // Columns of data
     psVector *x, *y;                    // Image coordinates
     psVector *ra, *dec;                 // Sky coordinates
+    psMetadata *deteffHeader;           // Detection efficiency header (extension names *.deteff)
+    psMetadata *deteffTable;            // Detection efficiency table
 } ppMopsDetections;
 

trunk/ppTranslate/src/ppMopsDetections.c

@@ -10 +10 @@
 static void mopsDetectionsFree(ppMopsDetections *det)
 {
+    psFree(det->component);
     psFree(det->raBoresight);
     psFree(det->decBoresight);
@@ -19 +20 @@
     psFree(det->ra);
     psFree(det->dec);
+    psFree(det->deteffHeader);
+    psFree(det->deteffTable);
 
     return;
@@ -28 +31 @@
     psMemSetDeallocator(det, (psFreeFunc)mopsDetectionsFree);
 
+    det->component = NULL;
     det->raBoresight = NULL;
     det->decBoresight = NULL;
@@ -45 +49 @@
     det->ra = NULL;
     det->dec = NULL;
+    det->deteffHeader = NULL;
+    det->deteffTable = NULL;
 
     return det;

trunk/ppTranslate/src/ppMopsRead.c

@@ -4 +4 @@
 
 #include <stdio.h>
+#include <string.h>
 #include <pslib.h>
 
@@ -16 +17 @@
     psArray *detections = psArrayAlloc(num); // Array of detections, to return
     for (int i = 0; i < num; i++) {
-        psFits *fits = psFitsOpen(inNames->data[i], "r"); // FITS file
+        const char *name = inNames->data[i]; // File name
+        psFits *fits = psFitsOpen(name, "r"); // FITS file
         if (!fits) {
             psError(PS_ERR_IO, false, "Unable to open input %d", i);
@@ -41 +43 @@
             continue;
         }
-        ppMopsDetections *det = ppMopsDetectionsAlloc();
+        ppMopsDetections *det = detections->data[i] = ppMopsDetectionsAlloc();
+        det->component = psStringNCopy(name, strrchr(name, '.') - name); // Strip off extension
         det->header = header;
         det->num = size;
@@ -61 +64 @@
         det->naxis2 = psMetadataLookupS32(NULL, header, "IMNAXIS2");
 
+        det->psfHeader = psFitsReadHeader(NULL, fits);
+        if (!det->psfHeader) {
+            psError(psErrorCodeLast(), false, "Unable to read header %d", i);
+            return false;
+        }
         psMetadata *table = det->table = psFitsReadTableAllColumns(fits); // Table of interest
         if (!table) {
@@ -66 +74 @@
             return false;
         }
-        psFitsClose(fits);
 
         psVector *ra = psMetadataLookupVector(NULL, table, "RA_PSF");
@@ -80 +87 @@
         }
 
-        psTrace("ppMops.read", 2, "Read %ld rows from %s\n", det->num, (const char*)inNames->data[i]);
+        psTrace("ppMops.read", 2, "Read %ld rows from %s\n", det->num, det->component);
 
-        detections->data[i] = det;
+        if (!psFitsMoveExtName(fits, "SkyChip.deteff")) {
+            psWarning("No detection efficiencies included in %s", det->component);
+            psErrorStackPrint(stderr, "No detection efficiencies included in %s", det->component);
+            psErrorClear();
+            continue;
+        }
+
+        det->deteffHeader = psFitsReadHeader(NULL, fits);
+        if (!det->deteffHeader) {
+            psWarning("Unable to read detection efficiency header in %s", det->component);
+            psErrorClear();
+            continue;
+        }
+        det->deteffTable = psFitsReadTableAllColumns(fits);
+        if (!det->deteffTable) {
+            psFree(det->deteffHeader);
+            det->deteffHeader = NULL;
+            psWarning("Unable to read detection efficiency table in %s", det->component);
+            psErrorClear();
+            continue;
+        }
+        psTrace("ppMops.read", 2, "Read detection efficiency from %s\n", det->component);
+        psFitsClose(fits);
     }
 

trunk/ppTranslate/src/ppMopsWrite.c

@@ -46 +46 @@
         ppMopsDetections *det = detections->data[i]; // Detections for extension
         psTrace("ppMops.write", 1, "Writing extension %d to %s", i, args->output);
-        if (!psFitsWriteTableAllColumns(fits, det->header, det->table, NULL)) {
-            psError(psErrorCodeLast(), false, "Unable to write extension %d", i);
+        psString hdrName = NULL, psfName = NULL, deteffName = NULL;
+        psStringAppend(&hdrName, "%s.hdr", det->component);
+        psStringAppend(&psfName, "%s.psf", det->component);
+        psStringAppend(&deteffName, "%s.deteff", det->component);
+
+        if (!psFitsWriteBlank(fits, det->header, hdrName)) {
+            psError(psErrorCodeLast(), false, "Unable to write header %d", i);
             return false;
         }
+        if (!psFitsWriteTableAllColumns(fits, det->psfHeader, det->table, psfName)) {
+            psError(psErrorCodeLast(), false, "Unable to write table %d", i);
+            return false;
+        }
+        if (det->deteffHeader && det->deteffTable &&
+            !psFitsWriteTableAllColumns(fits, det->deteffHeader, det->deteffTable, deteffName)) {
+            psError(psErrorCodeLast(), false, "Unable to write detection efficiency %d", i);
+            return false;
+        }
+        psFree(hdrName);
+        psFree(psfName);
+        psFree(deteffName);
     }
     psFitsClose(fits);