Changeset 23719 for branches/pap/ppSub/src/ppSubReadoutStats.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)
• ppSubReadoutStats.c (modified) (2 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/ppSubReadoutStats.c

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-bool ppSubReadoutStats(pmConfig *config, ppSubData *data, const pmFPAview *view)
+#include <pslib.h>
+#include <psmodules.h>
+#include <ppStats.h>
+
+#include "ppSub.h"
+
+
+bool ppSubReadoutStats(pmConfig *config, ppSubData *data)
 {
     psAssert(config, "Require configuration");
     psAssert(data, "Require data");
-    psAssert(view, "Require view");
 
     if (!data->statsFile) {
@@ -14 +23 @@
     if (!output) {
         psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find file PPSUB.OUTPUT.\n");
-        goto ERROR;
+        return false;
     }
     psImageMaskType maskValue = pmConfigMaskGet("MASK.VALUE", config);
+    pmFPAview *view = ppSubViewReadout(); // View to readout
     ppStatsFPA(data->stats, output->fpa, view, maskValue, config);
+
+    pmReadout *outRO = pmFPAviewThisReadout(view, output->fpa); // Readout of interest
+    psFree(view);
 
     // Statistics on the matching

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