Index: trunk/psModules/src/objects/pmSourceIO_MatchedRefs.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_MatchedRefs.c	(revision 24489)
+++ trunk/psModules/src/objects/pmSourceIO_MatchedRefs.c	(revision 24694)
@@ -43,5 +43,5 @@
 #include "pmAstrometryWCS.h"
 
-bool pmSourceWriteMatchedRefs (psFits *fits, pmFPA *fpa, pmConfig *config) {
+bool pmSourceIO_WriteMatchedRefs (psFits *fits, pmFPA *fpa, pmConfig *config) {
 
     bool status = true;
@@ -63,65 +63,70 @@
     if (!REFS_OUTPUT) return true;
 
-    psArray *table = psArrayAllocEmpty (0x1000);
-    pmFPAview *view = pmFPAviewAlloc (0);
+    psArray *table = psMetadataLookupPtr (&status, fpa->analysis, "MATCHED_REFS");
+    psMemIncrRefCounter (table);
 
-    // this loop selects the matched stars for all chips
-    while ((chip = pmFPAviewNextChip (view, fpa, 1)) != NULL) {
-        psTrace ("psastro", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
-        if (!chip->process || !chip->file_exists) continue;
+    if (!table) {
+	table = psArrayAllocEmpty (0x1000);
+	pmFPAview *view = pmFPAviewAlloc (0);
 
-        char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
+	// this loop selects the matched stars for all chips
+	while ((chip = pmFPAviewNextChip (view, fpa, 1)) != NULL) {
+	    psTrace ("psastro", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+	    if (!chip->process || !chip->file_exists) continue;
 
-        while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
-            psTrace ("psastro", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
-            if (!cell->process || !cell->file_exists) continue;
+	    char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
 
-            // process each of the readouts
-            // XXX there can only be one readout per chip, right?
-            while ((readout = pmFPAviewNextReadout (view, fpa, 1)) != NULL) {
-                if (! readout->data_exists) continue;
+	    while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
+		psTrace ("psastro", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+		if (!cell->process || !cell->file_exists) continue;
 
-                // select the raw objects for this readout
-                psArray *rawstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.RAWSTARS");
-                if (rawstars == NULL) continue;
+		// process each of the readouts
+		// XXX there can only be one readout per chip, right?
+		while ((readout = pmFPAviewNextReadout (view, fpa, 1)) != NULL) {
+		    if (! readout->data_exists) continue;
 
-                // select the raw objects for this readout
-                psArray *refstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.REFSTARS");
-                if (refstars == NULL) continue;
-                psTrace ("psastro", 4, "Trying %ld refstars\n", refstars->n);
+		    // select the raw objects for this readout
+		    psArray *rawstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.RAWSTARS");
+		    if (rawstars == NULL) continue;
 
-                psArray *matches = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.MATCH");
-                if (matches == NULL) continue;
+		    // select the raw objects for this readout
+		    psArray *refstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.REFSTARS");
+		    if (refstars == NULL) continue;
+		    psTrace ("psastro", 4, "Trying %ld refstars\n", refstars->n);
 
-                for (int i = 0; i < matches->n; i++) {
-                    pmAstromMatch *match = matches->data[i];
+		    psArray *matches = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.MATCH");
+		    if (matches == NULL) continue;
 
-                    pmAstromObj *raw = rawstars->data[match->raw];
-                    pmAstromObj *ref = refstars->data[match->ref];
+		    for (int i = 0; i < matches->n; i++) {
+			pmAstromMatch *match = matches->data[i];
 
-                    psMetadata *row = psMetadataAlloc ();
-                    psMetadataAdd (row, PS_LIST_TAIL, "RA",       PS_DATA_F64, "right ascension (deg, J2000)", PM_DEG_RAD*ref->sky->r);
-                    psMetadataAdd (row, PS_LIST_TAIL, "DEC",      PS_DATA_F64, "declination (deg, J2000)",     PM_DEG_RAD*ref->sky->d);
-                    psMetadataAdd (row, PS_LIST_TAIL, "X_CHIP",   PS_DATA_F32, "x coord on chip",              raw->chip->x);
-                    psMetadataAdd (row, PS_LIST_TAIL, "Y_CHIP",   PS_DATA_F32, "y coord on chip",              raw->chip->y);
-                    psMetadataAdd (row, PS_LIST_TAIL, "X_FPA",    PS_DATA_F32, "x coord on focal plane",       raw->FP->x);
-                    psMetadataAdd (row, PS_LIST_TAIL, "Y_FPA",    PS_DATA_F32, "y coord on focal plane",       raw->FP->y);
-                    psMetadataAdd (row, PS_LIST_TAIL, "MAG_INST", PS_DATA_F32, "instrumental magnitude",       raw->Mag);
-                    psMetadataAdd (row, PS_LIST_TAIL, "MAG_REF",  PS_DATA_F32, "reference star magnitude",     ref->Mag);
-                    psMetadataAdd (row, PS_LIST_TAIL, "COLOR_REF",PS_DATA_F32, "reference star color",         ref->Color);
-                    psMetadataAdd (row, PS_LIST_TAIL, "CHIP_ID",  PS_DATA_STRING, "chip identifier",           chipName);
-                    // XXX need to add the reference color, but this needs getstar / dvo.photcodes for the reference to be refined.
+			pmAstromObj *raw = rawstars->data[match->raw];
+			pmAstromObj *ref = refstars->data[match->ref];
 
-                    psArrayAdd (table, 100, row);
-                    psFree (row);
-                }
-            }
-        }
-    }
-    psFree (view);
+			psMetadata *row = psMetadataAlloc ();
+			psMetadataAdd (row, PS_LIST_TAIL, "RA",       PS_DATA_F64, "right ascension (deg, J2000)", PM_DEG_RAD*ref->sky->r);
+			psMetadataAdd (row, PS_LIST_TAIL, "DEC",      PS_DATA_F64, "declination (deg, J2000)",     PM_DEG_RAD*ref->sky->d);
+			psMetadataAdd (row, PS_LIST_TAIL, "X_CHIP",   PS_DATA_F32, "x coord on chip",              raw->chip->x);
+			psMetadataAdd (row, PS_LIST_TAIL, "Y_CHIP",   PS_DATA_F32, "y coord on chip",              raw->chip->y);
+			psMetadataAdd (row, PS_LIST_TAIL, "X_FPA",    PS_DATA_F32, "x coord on focal plane",       raw->FP->x);
+			psMetadataAdd (row, PS_LIST_TAIL, "Y_FPA",    PS_DATA_F32, "y coord on focal plane",       raw->FP->y);
+			psMetadataAdd (row, PS_LIST_TAIL, "MAG_INST", PS_DATA_F32, "instrumental magnitude",       raw->Mag);
+			psMetadataAdd (row, PS_LIST_TAIL, "MAG_REF",  PS_DATA_F32, "reference star magnitude",     ref->Mag);
+			psMetadataAdd (row, PS_LIST_TAIL, "COLOR_REF",PS_DATA_F32, "reference star color",         ref->Color);
+			psMetadataAdd (row, PS_LIST_TAIL, "CHIP_ID",  PS_DATA_STRING, "chip identifier",           chipName);
+			// XXX need to add the reference color, but this needs getstar / dvo.photcodes for the reference to be refined.
 
-    if (table->n == 0) {
-        psFree(table);
-        return true;
+			psArrayAdd (table, 100, row);
+			psFree (row);
+		    }
+		}
+	    }
+	}
+	psFree (view);
+
+	if (table->n == 0) {
+	    psFree(table);
+	    return true;
+	}
     }
 
@@ -135,2 +140,34 @@
     return true;
 }
+
+bool pmSourceIO_ReadMatchedRefs (psFits *fits, pmFPA *fpa, const pmConfig *config) {
+
+    bool status = true;
+
+    // check if we've already read (attempted to read) REFMATCH
+    bool readMatchedRefs = psMetadataLookupBool (&status, fpa->analysis, "READ.REFMATCH");
+    if (readMatchedRefs) return true;
+
+    // try find the MATCHED_REFS extension.  if non-existent, note that we tried, and move on.
+    if (!psFitsMoveExtName (fits, "MATCHED_REFS")) {
+	psMetadataAddBool (fpa->analysis, PS_LIST_TAIL, "READ.REFMATCH", PS_META_REPLACE, "attempted to read MATCHED_REFS", true);
+	return true;
+    }
+    
+    // We get the size of the table, and allocate the array of sources first because the table
+    // is large and ephemeral --- when the table gets blown away, whatever is allocated after
+    // the table is read blocks the free.  In fact, it's better to read the table row by row.
+    long numRows = psFitsTableSize(fits); // Number of sources in table
+    psArray *rows = psArrayAlloc(numRows); // Array of sources, to return
+
+    // first, check if there are any matches to be written
+    for (int i = 0; i < numRows; i++) {
+        psMetadata *row = psFitsReadTableRow(fits, i); // Table row
+	rows->data[i] = row;
+    }
+
+    psMetadataAddArray (fpa->analysis, PS_LIST_TAIL, "MATCHED_REFS", PS_META_REPLACE, "MATCHED_REFS", rows);
+    psFree (rows);
+
+    return true;
+}