Changeset 17834

Timestamp:

May 28, 2008, 12:14:12 PM (18 years ago)

Author:

Paul Price

Message:

Was doing the photometry on the stacked image!

Location:

trunk/ppSub/src

Files:

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

trunk/ppSub/src/ppSubCamera.c

@@ -153 +153 @@
 
         // Internal-ish file for getting the PSF from the matched addition
-        pmFPAfile *psf = pmFPAfileDefineSkycell(config, output->fpa, "PSPHOT.PSF.LOAD");
+        pmFPAfile *psf = pmFPAfileDefineSkycell(config, psphot->fpa, "PSPHOT.PSF.LOAD");
         if (!psf) {
             psError(PS_ERR_IO, false, "Failed to build FPA from PSPHOT.PSF.LOAD");

trunk/ppSub/src/ppSubReadout.c

@@ -196 +196 @@
 
     // Photometry stage 1: measure the PSF
+    pmPSF *psf = NULL;                  // PSF for photometry
     if (psMetadataLookupBool(NULL, config->arguments, "PHOTOMETRY")) {
         // We use a summed image as the basis for the PSF: this will have the maximum S/N.
@@ -233 +234 @@
         psMetadataRemoveKey(photRO->analysis, "PSPHOT.HEADER");
 
-        pmPSF *psf = psMetadataLookupPtr(NULL, photRO->parent->parent->analysis, "PSPHOT.PSF"); // PSF
+        psf = psMemIncrRefCounter(psMetadataLookupPtr(NULL, photRO->parent->parent->analysis, "PSPHOT.PSF"));
         if (!psf) {
             psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find PSF from psphot");
@@ -239 +240 @@
         }
 
-        pmReadout *psfRO = pmFPAfileThisReadout(config->files, view, "PSPHOT.PSF.LOAD");
-        if (!psfRO) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find file PSPHOT.PSF.LOAD");
-            return false;
-        }
-        psMetadataAddPtr(psfRO->parent->parent->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN,
-                         "PSF from matched addition", psf);
+        pmCell *photCell = pmFPAfileThisCell(config->files, view, "PSPHOT.INPUT");
+        pmCellFreeReadouts(photCell);
     }
 
@@ -308 +304 @@
     }
 
+    psTraceSetLevel("psphot", 6);
+
     // Photometry stage 2: find and measure sources on the subtracted image
     if (psMetadataLookupBool(NULL, config->arguments, "PHOTOMETRY")) {
         // The PSF should already be stored for the readout
         pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT");
+        pmFPACopy(photFile->fpa, outRO->parent->parent->parent);
+
+        pmReadout *psfRO = pmFPAfileThisReadout(config->files, view, "PSPHOT.PSF.LOAD");
+        if (!psfRO) {
+            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find file PSPHOT.PSF.LOAD");
+            return false;
+        }
+        psMetadataAddPtr(psfRO->parent->parent->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN,
+                         "PSF from matched addition", psf);
 
         // Need to ensure aperture residual is not calculated