Changeset 28281 for trunk/ppBackground

Timestamp:

Jun 9, 2010, 6:36:37 PM (16 years ago)

Author:

Paul Price

Message:

Add call to ppStats.

Location:

trunk/ppBackground

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/ppBackgroundLoop.c (modified) (3 diffs)

trunk/ppBackground/configure.ac

@@ -20 +20 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.0.0])
 PKG_CHECK_MODULES([PSMODULE], [psmodules >= 1.0.0])
+PKG_CHECK_MODULES([PPSTATS], [ppStats >= 1.0.0]) 
 PKG_CHECK_MODULES([PSPHOT], [psphot])
 

trunk/ppBackground/src/Makefile.am

@@ -25 +25 @@
 
 
-ppBackground_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPBACKGROUND_CFLAGS)
-ppBackground_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PSPHOT_LIBS)   $(PPBACKGROUND_LIBS)
+ppBackground_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPBACKGROUND_CFLAGS)
+ppBackground_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPBACKGROUND_LIBS)
 
 ppBackground_SOURCES =          \

trunk/ppBackground/src/ppBackgroundLoop.c

@@ -6 +6 @@
 #include <pslib.h>
 #include <psmodules.h>
+#include <ppStats.h>
 
 #include "ppBackground.h"
@@ -18 +19 @@
     pmFPA *patternMosaic = pmFPAConstruct(file->camera, file->cameraName); // Mosaicked FPA for pattern
 
-    psImageMaskType maskBad = pmConfigMaskGet("BLANK", config); // Mask value to set
+    psImageMaskType maskBad = pmConfigMaskGet("DETECTOR", config); // Mask value to set
 
     pmFPAview *view = pmFPAviewAlloc(0); // Pointer into FPA hierarchy
@@ -154 +155 @@
     }
 
+    psFree(patternMosaic);
+
+    if (data->stats) {
+        psImageMaskType maskVal = 0;    // Bits to mask
+        if (!pmConfigMaskSetBits(&maskVal, NULL, config)) {
+            psError(psErrorCodeLast(), false, "Unable to find bits to mask");
+            return false;
+        }
+        ppStatsFPA(data->stats, file->fpa, view, maskVal, config);
+    }
+
     psFree(view);
-    psFree(patternMosaic);
 
     return true;