Changeset 23688 for trunk/ppSub/src/ppSubReadout.c

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• ppSub (modified) (1 prop)
• ppSub/src/ppSubReadout.c (modified) (4 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -21 +21 @@
 #include "ppSub.h"
 
-bool ppSubReadout(pmConfig *config, psMetadata *stats, const pmFPAview *view)
+bool ppSubReadout(pmConfig *config, ppSubData *data, const pmFPAview *view)
 {
     psTimerStart("PPSUB_MATCH");
@@ -30 +30 @@
     }
 
-    if (!ppSubMatchPSFs(config, view)) {
+    if (!ppSubMatchPSFs(config, data, view)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to match PSFs.");
         return false;
+    } else if (data->quality) {
+        // Can't do anything at all
+        return true;
     }
 
@@ -40 +43 @@
     }
 
-    if (!ppSubMakePSF(config, view)) {
+    if (!data->quality && !ppSubMakePSF(config, data, view)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to generate PSF.");
         return false;
@@ -56 +59 @@
     }
 
-    if (!ppSubReadoutPhotometry(config, stats, view)) {
+    if (!data->quality && !ppSubReadoutPhotometry(config, data, view)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry.");
         return false;
     }
 
-    if (!ppSubReadoutUpdate(config, stats, view)) {
+    if (!ppSubReadoutUpdate(config, data, view)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to update.");
         return false;