Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackPhotometry.c

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)
• ppStack (modified) (1 prop)
• ppStack/src (modified) (1 prop)
• ppStack/src/ppStackPhotometry.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/ppStack/src

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackPhotometry.c

@@ -69 +69 @@
 
     if (!psphotReadoutKnownSources(config, photView, inSources)) {
-        // Clear the error, so that the output files are written.
-        psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry on stacked image.");
-        psFree(photView);
-        return false;
+        // This is likely a data quality issue
+        // XXX Split into multiple cases using error codes?
+        psErrorStackPrint(stderr, "Unable to perform photometry on image");
+        psWarning("Unable to perform photometry on image --- suspect bad data quality.");
+        if (options->stats && psMetadataLookupS32(NULL, options->stats, "QUALITY") == 0) {
+            psMetadataAddS32(options->stats, PS_LIST_TAIL, "QUALITY", PS_META_REPLACE,
+                             "Unable to perform photometry on image", psErrorCodeLast());
+        }
+        psErrorClear();
+        psphotFilesActivate(config, false);
     }
 
@@ -88 +94 @@
         psArray *sources = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.SOURCES"); // Sources
         psMetadataAddS32(options->stats, PS_LIST_TAIL, "NUM_SOURCES", 0,
-                         "Number of sources detected", sources->n);
+                         "Number of sources detected", sources ? sources->n : 0);
         psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_PHOT", 0,
                          "Time to do photometry", psTimerMark("PPSTACK_PHOT"));

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h