Changeset 21524 for trunk/ppSub/src/ppSubReadout.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/ppSubReadout.c (modified) (3 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.112 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-09 21:26:05 $
+ *  @version $Revision: 1.113 $ $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 "ppSub.h"
@@ -17 +25 @@
     psTimerStart("PPSUB_MATCH");
 
-    if (!ppSubSetMasks (config, view)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
+    if (!ppSubSetMasks(config, view)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to set masks.");
         return false;
     }
 
-    if (!ppSubMatchPSFs (config, view)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
+    if (!ppSubMatchPSFs(config, view)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to match PSFs.");
         return false;
     }
 
-    if (!ppSubDefineOutput (config, view)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
-        return false;
-    }
-
-    if (!ppSubVarianceFactors (config, stats, view)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
+    if (!ppSubDefineOutput(config, view)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to define output.");
         return false;
     }
 
     if (!ppSubMakePSF(config, view)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
+        psError(PS_ERR_UNKNOWN, false, "Unable to generate PSF.");
         return false;
     }
 
-    if (!ppSubReadoutSubtract (config, view)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
+    if (!ppSubReadoutSubtract(config, view)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to subtract images.");
         return false;
     }
@@ -53 +56 @@
     }
 
-    if (!ppSubReadoutPhotometry (config, stats, view)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
+    if (!ppSubReadoutPhotometry(config, stats, view)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry.");
         return false;
     }
 
-    if (!ppSubReadoutUpdate (config, view)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
+    if (!ppSubReadoutUpdate(config, stats, view)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to update.");
         return false;
     }