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

Timestamp:

Feb 17, 2009, 2:31:20 PM (17 years ago)

Author:

Paul Price

Message:

Cleaning up. Had trouble getting the output photometry file written out, but works now.

File:

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

trunk/ppSub/src/ppSubCamera.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-06 03:20:02 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <pslib.h>
+#include <psmodules.h>
+#include <psphot.h>
 
 #include "ppSub.h"
@@ -257 +266 @@
     // psPhot input
     if (psMetadataLookupBool(NULL, recipe, "PHOTOMETRY")) {
-        psphotModelClassInit ();        // load implementation-specific models
-
-
-        // Internal-ish file for getting the PSF from the matched addition
+        psphotModelClassInit();        // load implementation-specific models
+
+        // Internal-ish file for getting the PSF from the minuend
         pmFPAfile *psf = pmFPAfileDefineOutputFromFile(config, output, "PSPHOT.PSF.LOAD");
         if (!psf) {
@@ -272 +280 @@
         pmFPAfileActivate(config->files, false, "PSPHOT.PSF.LOAD");
 
-        pmFPAfile *psphotResid = pmFPAfileDefineOutputForFormat (config, NULL, "PSPHOT.RESID", output->cameraName, output->formatName);
-        if (!psphotResid) {
-            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.RESID");
-            return false;
-        }
-        // make this optional: psphotResid->save = true;
-    }
-
-    // Always do this, since we're using psphot for the background model.
-    // XXX Not certain that I need to generate a separate pmFPAfile for PSPHOT.INPUT
-    if (0) {
         pmFPAfile *psphot = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");
         if (!psphot) {
@@ -297 +294 @@
             return false;
         }
-
     }