Changeset 14821

Timestamp:

Sep 11, 2007, 2:49:39 PM (19 years ago)

Author:

Paul Price

Message:

Doesn't like reading sources into the same FPA structure as the images (header is different), so read it into its own, and then use that.

Location:

trunk/ppSub/src

Files:

• ppSubCamera.c (modified) (1 diff)
• ppSubReadout.c (modified) (2 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -128 +128 @@
     psFree(view);
 
-    pmFPAfile *sources = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.SOURCES", "PPSUB.SOURCES");
+    pmFPAfile *sources = pmFPAfileDefineFromArgs(&status, config, "PPSUB.SOURCES", "PPSUB.SOURCES");
     if (!status) {
         psError(PS_ERR_IO, false, "Failed to load file definition PPSUB.SOURCES");

trunk/ppSub/src/ppSubReadout.c

@@ -16 +16 @@
     pmReadout *inRO = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT"); // Input readout
     pmReadout *refRO = pmFPAfileThisReadout(config->files, view, "PPSUB.REF"); // Reference readout
+    pmReadout *sourcesRO = pmFPAfileThisReadout(config->files, view, "PPSUB.SOURCES"); // Readout with sources
     pmCell *outCell = pmFPAfileThisCell(config->files, view, "PPSUB.OUTPUT"); // Output cell
     pmReadout *outRO = pmReadoutAlloc(outCell); // Output readout
@@ -83 +84 @@
     }
 
-    psArray *sources = psMetadataLookupPtr(&mdok, refRO->analysis, "PSPHOT.SOURCES"); // Sources in image
+    psArray *sources = psMetadataLookupPtr(&mdok, sourcesRO->analysis, "PSPHOT.SOURCES"); // Sources in image
 
     if (!pmSubtractionMatch(outRO, refRO, inRO, footprint, regionSize, spacing, threshold, sources,