Changeset 28043 for trunk/pswarp

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)
• pswarp/src/Makefile.am (modified) (1 diff)
• pswarp/src/pswarp.h (modified) (1 diff)
• pswarp/src/pswarpLoop.c (modified) (4 diffs)
• pswarp/src/pswarpMaskStats.c (copied) (copied from branches/czw_branch/20100427/pswarp/src/pswarpMaskStats.c )
• pswarp/src/pswarpVersion.c (modified) (1 diff)

trunk/pswarp/src/Makefile.am

@@ -34 +34 @@
         pswarpErrorCodes.c              \
         pswarpMapGrid.c                 \
+        pswarpMaskStats.c               \
         pswarpMatchRange.c              \
         pswarpParseCamera.c             \

trunk/pswarp/src/pswarp.h

@@ -109 +109 @@
     );
 
+bool pswarpMaskStats(const pmReadout *readout,
+                     psMetadata *stats,
+                     const pmConfig *config);
+
+
 /**
  * define threads for this program

trunk/pswarp/src/pswarpLoop.c

@@ -266 +266 @@
         goto DONE;
     }
-
+    bool doStats = psMetadataLookupBool(&mdok,recipe,"MASK.STATS");
+    if (doStats) {
+      if (!pswarpMaskStats(output, stats, config)) {
+        psError(psErrorCodeLast(), false, "Unable to calculate mask stats.");
+        psFree(cells);
+        psFree(view);
+        goto DONE;
+      }
+    }
     // Set covariance matrix for output
     {
@@ -332 +340 @@
 
     pswarpVersionHeader(hdu->header);
-
+    
     if (!pmAstromWriteWCS(hdu->header, outFPA, outChip, WCS_NONLIN_TOL)) {
         psError(psErrorCodeLast(), false, "Unable to generate WCS header.");
@@ -347 +355 @@
     pswarpFileActivation(config, detectorFiles, false);
     pswarpFileActivation(config, independentFiles, false);
+
 
     // We need a new PSF model for the warped frame.  It would be good to generate this analytically, but
@@ -421 +430 @@
         }
     }
+    
 
     // Add MD5 information for readout

trunk/pswarp/src/pswarpVersion.c

@@ -85 +85 @@
     psString source  = pswarpSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "WARP_V", PS_META_REPLACE, NULL, PSWARP_VERSION);
+    
     psStringPrepend(&version, "pswarp version: ");
     psStringPrepend(&source, "pswarp source: ");