Changeset 23719 for branches/pap/ppSub/src/ppSubMakePSF.c

Timestamp:

Apr 6, 2009, 6:52:51 PM (17 years ago)

Author:

Paul Price

Message:

Making ppSub inverse mode work. Seems to work now --- produces the correct output files for inverse mode on and off, photometry on and off.

Location:

branches/pap/ppSub/src

Files:

• . (modified) (1 prop)
• ppSubMakePSF.c (modified) (7 diffs)

branches/pap/ppSub/src

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c

branches/pap/ppSub/src/ppSubMakePSF.c

@@ -22 +22 @@
 #include "ppSub.h"
 
-bool ppSubMakePSF(pmConfig *config, ppSubData *data, const pmFPAview *view)
+bool ppSubMakePSF(pmConfig *config, ppSubData *data)
 {
     psAssert(config, "Require configuration");
-    psAssert(view, "Require view");
+
+    if (!data->photometry) {
+        return true;
+    }
 
     psTimerStart("PPSUB_PHOT");
@@ -44 +47 @@
     pmReadout *minuend = NULL;          // Image that will be positive following subtraction
     pmFPAfile *minuendFile = NULL;      // File for minuend image
+    pmFPAview *view = ppSubViewReadout(); // View to readout
     if (reverse) {
         minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV");
@@ -53 +57 @@
 
 #if 1
+    pmFPAfile *photFile = psMetadataLookupPtr(&mdok, config->files, "PSPHOT.INPUT"); // Photometry file
+#if 0
+    pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout to photometer
     pmReadout *template = minuend;
-    pmFPAfile *photFile = psMetadataLookupPtr(&mdok, config->files, "PSPHOT.INPUT"); // Photometry file
-    pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout to photometer
     if (!photRO) {
         pmCell *cell = pmFPAviewThisCell(view, photFile->fpa); // Cell to photometer
@@ -74 +79 @@
     }
 #else
+    if (!pmFPACopy(photFile->fpa, minuendFile->fpa)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to copy FPA for photometry");
+        psFree(view);
+        return false;
+    }
+    pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout to photometer
+    if (psMetadataLookup(photRO->analysis, "PSPHOT.SOURCES")) {
+        psMetadataRemoveKey(photRO->analysis, "PSPHOT.SOURCES");
+    }
+#endif
+
+
+#else
     // Supply the minuend pmFPAfile to psphot as PSPHOT.INPUT:
     psMetadataAddPtr(config->files, PS_LIST_TAIL, "PSPHOT.INPUT", PS_DATA_UNKNOWN | PS_META_REPLACE,
@@ -87 +105 @@
         psErrorStackPrint(stderr, "Unable to determine PSF");
         psWarning("Unable to determine PSF --- suspect bad data quality.");
-        ppSubDataQuality(config, data, PSPHOT_ERR_PSF, PPSUB_FILES_PHOT);
+        ppSubDataQuality(config, data, PSPHOT_ERR_PSF, PPSUB_FILES_PHOT_SUB | PPSUB_FILES_PHOT_INV);
+        psFree(view);
         return true;
     }
@@ -93 +112 @@
     // Record the FWHM in the output header
     pmReadout *outRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT"); // Output readout
+    psFree(view);
     pmHDU *hdu = pmHDUFromCell(outRO->parent); // HDU with header
     psMetadataItemSupplement(hdu->header, psphotRecipe, "FWHM_MAJ");
@@ -100 +120 @@
     psMetadataRemoveKey(photRO->analysis, "PSPHOT.HEADER");
 
+    data->psf = psMemIncrRefCounter(psMetadataLookupPtr(NULL, photRO->parent->parent->analysis,
+                                                        "PSPHOT.PSF"));
+
     return true;
 }

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c