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

Timestamp:

Jun 3, 2010, 9:08:48 PM (16 years ago)

Author:

Paul Price

Message:

Finished rework of ppMops. Not yet tested though.

File:

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

trunk/ppTranslate/src/ppMopsRead.c

@@ -41 +41 @@
             continue;
         }
-        ppMopsDetections *det = ppMopsDetectionsAlloc(size);
+        ppMopsDetections *det = ppMopsDetectionsAlloc();
         det->header = header;
+        det->num = size;
 
         det->raBoresight = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.RA"));
@@ -60 +61 @@
         det->naxis2 = psMetadataLookupS32(NULL, header, "IMNAXIS2");
 
-        det->table = psFitsReadTableAllColumns(fits); // Table of interest
+        psMetadata *table = det->table = psFitsReadTableAllColumns(fits); // Table of interest
         if (!table) {
             psError(psErrorCodeLast(), false, "Unable to read table %d", i);
@@ -66 +67 @@
         }
         psFitsClose(fits);
-
-        psTrace("ppMops.read", 2, "Read %ld rows from %s\n", numGood, (const char*)inNames->data[i]);
 
         det->ra = psMemIncrRefCounter(psMetadataLookupVector(NULL, table, "RA_PSF"));
@@ -78 +77 @@
         }
 
+        psTrace("ppMops.read", 2, "Read %ld rows from %s\n", det->ra->n, (const char*)inNames->data[i]);
+
         detections->data[i] = det;
     }