Changeset 28043 for trunk/ppSub

Timestamp:

May 19, 2010, 5:13:52 PM (16 years ago)

Author:

watersc1

Message:

Merging czw_branch (maskstats and software versions) back into the trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• ppSub/src/Makefile.am (modified) (1 diff)
• ppSub/src/ppSub.h (modified) (1 diff)
• ppSub/src/ppSubLoop.c (modified) (1 diff)
• ppSub/src/ppSubMaskStats.c (copied) (copied from branches/czw_branch/20100427/ppSub/src/ppSubMaskStats.c )
• ppSub/src/ppSubVersion.c (modified) (1 diff)

trunk/ppSub/src/Makefile.am

@@ -41 +41 @@
         ppSubMakePSF.c                  \
         ppSubMatchPSFs.c                \
+        ppSubMaskStats.c                \
         ppSubReadoutInverse.c           \
         ppSubReadoutJpeg.c              \

trunk/ppSub/src/ppSub.h

@@ -74 +74 @@
 bool ppSubSetMasks(pmConfig *config     ///< Configuration
     );
+
+// Calculate mask statistics
+bool ppSubMaskStats(pmConfig *config, pmFPAview *view, psMetadata *stats);
 
 /// Generate the PSF-matching kernel and convolve the images as needed.  Most of this function involves

trunk/ppSub/src/ppSubLoop.c

@@ -144 +144 @@
         return false;
     }
-
+    // Do Mask Stats
+    {
+      pmFPAview *view = ppSubViewReadout(); // View to readout
+      if (!ppSubMaskStats(config, view,data->stats)) {
+        psError(psErrorCodeLast(), false, "Unable to generate mask statistics");
+        return(false);
+      }
+    }
+    
     // generate the binned image used to write the jpeg
     if (!ppSubReadoutJpeg(config)) {

trunk/ppSub/src/ppSubVersion.c

@@ -86 +86 @@
     psString source  = ppSubSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "PPSUB_V", PS_META_REPLACE, NULL, PPSUB_VERSION);
+    
     psStringPrepend(&version, "ppSub version: ");
     psStringPrepend(&source, "ppSub source: ");