Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/pswarp/src

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• pswarp/src (modified) (1 prop)
• pswarp/src/Makefile.am (modified) (2 diffs)
• pswarp/src/pswarp.h (modified) (1 diff)
• pswarp/src/pswarpArguments.c (modified) (3 diffs)
• pswarp/src/pswarpErrorCodes.dat (modified) (2 diffs)
• pswarp/src/pswarpErrorCodes.h.in (modified) (1 diff)
• pswarp/src/pswarpLoop.c (modified) (7 diffs)
• pswarp/src/pswarpPixelFraction.c (deleted)
• pswarp/src/pswarpPixelsLit.c (copied) (copied from trunk/pswarp/src/pswarpPixelsLit.c )
• pswarp/src/pswarpVersion.c (modified) (2 diffs)
• pswarp/src/pswarpVersionDefinitions.h.in (copied) (copied from trunk/pswarp/src/pswarpVersionDefinitions.h.in )

branches/cnb_branches/cnb_branch_20090301/pswarp/src

@@ -13 +13 @@
 config.h.in
 stamp-h1
+pswarpVersionDefinitions.h

@@ -13 +13 @@
 config.h.in
 stamp-h1
+pswarpVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/pswarp/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = pswarp
 
-PSWARP_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PSWARP_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PSWARP_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+if HAVE_SVNVERSION
+PSWARP_VERSION=`$(SVNVERSION) ..`
+else
+PSWARP_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PSWARP_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
+PSWARP_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PSWARP_BRANCH="UNKNOWN"
+PSWARP_SOURCE="UNKNOWN"
+endif
 
 # Force recompilation of pswarpVersion.c, since it gets the version information
-pswarpVersion.c: FORCE
-        touch pswarpVersion.c
+pswarpVersion.c: pswarpVersionDefinitions.h
+pswarpVersionDefinitions.h: pswarpVersionDefinitions.h.in FORCE
+        -$(RM) pswarpVersionDefinitions.h
+        $(SED) -e "s|@PSWARP_VERSION@|\"$(PSWARP_VERSION)\"|" -e "s|@PSWARP_BRANCH@|\"$(PSWARP_BRANCH)\"|" -e "s|@PSWARP_SOURCE@|\"$(PSWARP_SOURCE)\"|" pswarpVersionDefinitions.h.in > pswarpVersionDefinitions.h
 FORCE: ;
 
-pswarp_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PSWARP_CFLAGS) -DPSWARP_VERSION=\"$(PSWARP_VERSION)\" -DPSWARP_BRANCH=\"$(PSWARP_BRANCH)\" -DPSWARP_SOURCE=\"$(PSWARP_SOURCE)\"
+pswarp_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PSWARP_CFLAGS)
 pswarp_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSWARP_LIBS)
 
@@ -24 +36 @@
         pswarpMatchRange.c              \
         pswarpParseCamera.c             \
-        pswarpPixelFraction.c           \
+        pswarpPixelsLit.c               \
         pswarpSetMaskBits.c             \
         pswarpSetThreads.c              \

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarp.h

@@ -102 +102 @@
                           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
+/// Get the range of lit pixels
+bool pswarpPixelsLit(const pmReadout *readout, ///< Readout to inspect
+                     psMetadata *stats, ///< Statistics to update with the result
+                     const pmConfig *config ///< Configuration
     );
 

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpArguments.c

@@ -163 +163 @@
     }
 
-    float acceptFrac = psMetadataLookupF32(&status, recipe, "ACCEPT.FRAC"); ///< Min fraction of good pixels
-    if (!status) {
-        acceptFrac = 0.0;
-        psWarning("ACCEPT.FRAC is not set in the %s recipe --- defaulting to %f.", PSWARP_RECIPE, poorFrac);
-    }
-
     // Set recipe values in the recipe (since we've possibly altered some)
     psMetadataAddS32(recipe, PS_LIST_TAIL, "GRID.NX", PS_META_REPLACE,
@@ -180 +174 @@
     psMetadataAddF32(recipe, PS_LIST_TAIL, "POOR.FRAC", PS_META_REPLACE,
                      "Fraction of bad flux for a pixel to be marked as poor", poorFrac);
-    psMetadataAddF32(recipe, PS_LIST_TAIL, "ACCEPT.FRAC", PS_META_REPLACE,
-                     "Minimum fraction of good pixels for result to be accepted", acceptFrac);
 
     // Set recipe values in the arguments
@@ -194 +186 @@
     psMetadataAddF32(config->arguments, PS_LIST_TAIL, "POOR.FRAC", 0,
                      "Fraction of bad flux for a pixel to be marked as poor", poorFrac);
-    psMetadataAddF32(config->arguments, PS_LIST_TAIL, "ACCEPT.FRAC", 0,
-                     "Minimum fraction of good pixels for result to be accepted", acceptFrac);
 
     psTrace("pswarp", 1, "Done with pswarpArguments...\n");

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpErrorCodes.dat

@@ -2 +2 @@
 # This file is used to generate pswarpErrorClasses.h
 #
-BASE = 800              First value we use; lower values belong to psLib
-UNKNOWN                 Unknown PM error code
+BASE = 8000             First value we use; lower values belong to psLib
+UNKNOWN                 Unknown PSWARP error code
 NOT_IMPLEMENTED         Desired feature is not yet implemented
 ARGUMENTS               Incorrect arguments
@@ -9 +9 @@
 IO                      Problem in FITS I/O
 DATA                    Problem in data values
+NO_OVERLAP              No overlap between input and skycell

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpErrorCodes.h.in

@@ -21 +21 @@
  */
 typedef enum {
-    PSWARP_ERR_BASE = 600,
+    PSWARP_ERR_BASE = 8000,
     PSWARP_ERR_${ErrorCode},
     PSWARP_ERR_NERROR

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpLoop.c

@@ -142 +142 @@
         psFree(resolved);
         stats = psMetadataAlloc();
+        psMetadataAddS32(stats, PS_LIST_TAIL, "QUALITY", 0, "No problems", 0);
     }
 
@@ -273 +274 @@
     }
 
+    if (!output->data_exists) {
+        psWarning("No overlap between input and skycell.");
+        if (stats) {
+            psMetadataAddS32(stats, PS_LIST_TAIL, "QUALITY", PS_META_REPLACE,
+                             "No overlap between input and skycell", PSWARP_ERR_NO_OVERLAP);
+        }
+        psphotFilesActivate(config, false);
+        psFree(cells);
+        psFree(view);
+        goto DONE;
+    }
+
     pmCell *outCell = output->parent;   ///< Output cell
     pmChip *outChip = outCell->parent;  ///< Output chip
     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;
+    if (!pswarpPixelsLit(output, stats, config)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to calculate pixel regions.");
         psFree(cells);
         psFree(view);
-        goto COMPLETED;
+        return false;
     }
 
     // Set variance factor
     {
-        float varFactor = psMetadataLookupF32(NULL, output->analysis, PSWARP_ANALYSIS_VARFACTOR);
-        psAssert(isfinite(varFactor), "Should be something here.");
-        long goodPix = psMetadataLookupS64(NULL, output->analysis, PSWARP_ANALYSIS_GOODPIX);
-        psAssert(goodPix > 0, "Should be something here.");
+        bool mdok;                      // Status of MD lookup
+        float varFactor = psMetadataLookupF32(&mdok, output->analysis, PSWARP_ANALYSIS_VARFACTOR);
+        long goodPix = psMetadataLookupS64(&mdok, output->analysis, PSWARP_ANALYSIS_GOODPIX);
         varFactor /= goodPix;
 
@@ -364 +375 @@
     fileActivation(config, independentFiles, false);
 
-    // We need a new PSF model for the warped frame.  It would be good to generate this analytically, but that's going to be tricky.
-    // We have a list of sources, so we use those to redetermine the PSF model.
+    // We need a new PSF model for the warped frame.  It would be good to generate this analytically, but
+    // that's going to be tricky.  We have a list of sources, so we use those to redetermine the PSF model.
 
     if (psMetadataLookupBool(&mdok, config->arguments, "PSF")) {
@@ -394 +405 @@
         // measure the PSF using these sources
         if (!psphotReadoutFindPSF(config, view, sources)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to determine PSF for warped image.");
-            return false;
+            // This is likely a data quality issue
+            // XXX Split into multiple cases using error codes?
+            psErrorStackPrint(stderr, "Unable to determine PSF");
+            psWarning("Unable to determine PSF --- suspect bad data quality.");
+            if (stats && psMetadataLookupS32(NULL, stats, "QUALITY") == 0) {
+                psMetadataAddS32(stats, PS_LIST_TAIL, "QUALITY", PS_META_REPLACE,
+                                 "Unable to determine PSF", psErrorCodeLast());
+            }
+            psErrorClear();
+            psphotFilesActivate(config, false);
         }
 
@@ -448 +467 @@
     // Now done with the skycell side of things
 
-    COMPLETED:
+ DONE:
+
     // Write out summary statistics
     if (stats) {
@@ -464 +484 @@
         psFree((void*)statsMDC);
         fclose(statsFile);
+        pmConfigRunFilenameAddWrite(config, "STATS", statsName);
 
         psFree(stats);
@@ -471 +492 @@
     psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
     if (dump_file) {
-        pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PSWARP.INPUT"); // Input file
-        pmConfigDump(config, input->fpa, dump_file);
+        pmConfigDump(config, dump_file);
     }
 

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpVersion.c

@@ -20 +20 @@
 #include <ppStats.h>
 
-psString pswarpVersion(void)
-{
+#include "pswarp.h"
+#include "pswarpVersionDefinitions.h"
+
 #ifndef PSWARP_VERSION
 #error "PSWARP_VERSION is not set"
@@ -28 +29 @@
 #error "PSWARP_BRANCH is not set"
 #endif
-    return psStringCopy(PSWARP_BRANCH "@" PSWARP_VERSION);
+#ifndef PSWARP_SOURCE
+#error "PSWARP_SOURCE is not set"
+#endif
+
+psString pswarpVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", PSWARP_BRANCH, PSWARP_VERSION);
+    return value;
 }
 
 psString pswarpSource(void)
 {
-#ifndef PSWARP_SOURCE
-#error "PSWARP_SOURCE is not set"
-#endif
     return psStringCopy(PSWARP_SOURCE);
 }

@@ -13 +13 @@
 config.h.in
 stamp-h1
+pswarpVersionDefinitions.h