Changeset 20614 for trunk/ppSub/src/ppSubCamera.c

Timestamp:

Nov 9, 2008, 4:13:58 PM (18 years ago)

Author:

Paul Price

Message:

Fixing background subtraction.

File:

• trunk/ppSub/src/ppSubCamera.c (modified) (2 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -179 +179 @@
     if (psMetadataLookupBool(NULL, recipe, "PHOTOMETRY")) {
         psphotModelClassInit ();        // load implementation-specific models
-        pmFPAfile *psphot = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");
-        if (!psphot) {
-            psError(PS_ERR_IO, false, "Failed to build FPA from PSPHOT.INPUT");
-            return false;
-        }
-        if (psphot->type != PM_FPA_FILE_IMAGE) {
-            psError(PS_ERR_IO, true, "PSPHOT.INPUT is not of type IMAGE");
-            return false;
-        }
-
-        if (!psphotDefineFiles(config, psphot)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to set up psphot files.");
-            return false;
-        }
+
 
         // Internal-ish file for getting the PSF from the matched addition
@@ -205 +192 @@
         }
         pmFPAfileActivate(config->files, false, "PSPHOT.PSF.LOAD");
+    }
+
+    // Always do this, since we're using psphot for the background model.
+    {
+        pmFPAfile *psphot = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");
+        if (!psphot) {
+            psError(PS_ERR_IO, false, "Failed to build FPA from PSPHOT.INPUT");
+            return false;
+        }
+        if (psphot->type != PM_FPA_FILE_IMAGE) {
+            psError(PS_ERR_IO, true, "PSPHOT.INPUT is not of type IMAGE");
+            return false;
+        }
+
+        if (!psphotDefineFiles(config, psphot)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to set up psphot files.");
+            return false;
+        }
 
     }