Changeset 15608

Timestamp:

Nov 13, 2007, 12:02:34 PM (18 years ago)

Author:

Paul Price

Message:

Adding code to calculate fraction of good pixels. Set a boolean in the output stats indicating whether the result should be accepted.

Location:

trunk/pswarp/src

Files:

• Makefile.am (modified) (1 diff)
• pswarp.h (modified) (1 diff)
• pswarpLoop.c (modified) (3 diffs)
• pswarpPixelFraction.c (added)

trunk/pswarp/src/Makefile.am

@@ -14 +14 @@
         pswarpMatchRange.c              \
         pswarpParseCamera.c             \
+        pswarpPixelFraction.c           \
         pswarpTransformReadout_Opt.c    \
         pswarpVersion.c            
-#       pswarpTransformReadout.c
 
 noinst_HEADERS = \

trunk/pswarp/src/pswarp.h

@@ -55 +55 @@
 bool pswarpMapSetLocalModel (pswarpMap *map, pmReadout *dest, pmReadout *src, int ix, int iy);
 
-bool pswarpDefineSkycell (pmFPAfile **outFile, pmConfig **outConfig, pmConfig *config, const char *filename, const char *argname);
+bool pswarpDefineSkycell (pmFPAfile **outFile, pmConfig **outConfig, pmConfig *config,
+                          const char *filename, const char *argname);
+
+/// Check to see if the readout has a minimum fraction of "lit" pixels
+bool pswarpPixelFraction(const pmReadout *readout, ///< Readout to inspect
+                         psMetadata *stats, ///< Statistics to update with the result
+                         const pmConfig *config ///< Configuration
+    );
+

trunk/pswarp/src/pswarpLoop.c

@@ -215 +215 @@
     pmCell *outCell = output->parent;   // Output cell
     pmChip *outChip = outCell->parent;  // Output chip
-    pmFPA *outFPA = outChip->parent;    // Output FPA
+    pmFPA *outFPA = outChip->parent;    // Output FP
+
+    if (!pswarpPixelFraction(output, stats, config)) {
+        // Don't write output images, and don't bother about anything else
+        output->data_exists = outCell->data_exists = outChip->data_exists = false;
+        psFree(cells);
+        psFree(view);
+        goto COMPLETED;
+    }
 
     if (!pmConceptsAverageCells(outCell, cells, NULL, NULL, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to average cell concepts.");
         psFree(stats);
+        psFree(cells);
         psFree(view);
         return false;
@@ -266 +275 @@
         view->chip = view->cell = view->readout = 0;
         if (!psphotReadout(config, view)) {
-            psError(psErrorCodeLast(), false, "Unable to determine PSF for warped image.\n");
-            psFree(view);
-            return false;
+            // Can't do anything about it; let it continue
+            psErrorStackPrint(stderr, "Unable to determine PSF for warped image.\n");
+            psErrorClear();
         }
         psFree(view);
@@ -319 +328 @@
     // Now done with the skycell side of things
 
+    COMPLETED:
     // Write out summary statistics
     if (stats) {