Changeset 27158

Timestamp:

Mar 3, 2010, 1:38:58 PM (16 years ago)

Author:

Paul Price

Message:

Catch case where no input has any sources, so photometry can't be matched; then treat as bad data quality. Reworked how the bad data quality flag gets raised (since there's more than one source now) --- it's carried in the ppStackOptions, and then put in the statistics file at the end.

Location:

trunk/ppStack/src

Files:

• ppStackFinish.c (modified) (1 diff)
• ppStackLoop.c (modified) (1 diff)
• ppStackOptions.c (modified) (1 diff)
• ppStackOptions.h (modified) (1 diff)
• ppStackPhotometry.c (modified) (1 diff)
• ppStackSetup.c (modified) (1 diff)
• ppStackSources.c (modified) (2 diffs)

trunk/ppStack/src/ppStackFinish.c

@@ -70 +70 @@
     // Write out summary statistics
     if (options->stats) {
+
+        psMetadataAddS32(options->stats, PS_LIST_TAIL, "QUALITY", PS_META_REPLACE,
+                         "Bad data quality flag", options->quality);
         psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_STACK", 0,
                          "Total time", psTimerClear("PPSTACK_TOTAL"));

trunk/ppStack/src/ppStackLoop.c

@@ -80 +80 @@
              psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("prepare");
-
+    if (options->quality) {
+        // Can't do anything else
+        return true;
+    }
 
     // Convolve inputs

trunk/ppStack/src/ppStackOptions.c

@@ -56 +56 @@
     options->convVariances = NULL;
     options->num = 0;
+    options->quality = 0;
     options->psf = NULL;
     options->inputSeeing = NULL;

trunk/ppStack/src/ppStackOptions.h

@@ -17 +17 @@
     psArray *origCovars;                // Original covariances matrices
     int num;                            // Number of inputs
+    int quality;                        // Bad data quality flag
     // Prepare
     pmPSF *psf;                         // Target PSF

trunk/ppStack/src/ppStackPhotometry.c

@@ -72 +72 @@
         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());
+        if (options->quality == 0) {
+            options->quality = psErrorCodeLast();
         }
         psErrorClear();

trunk/ppStack/src/ppStackSetup.c

@@ -48 +48 @@
         psFree(resolved);
         options->stats = psMetadataAlloc();
-        psMetadataAddS32(options->stats, PS_LIST_TAIL, "QUALITY", 0, "No problems", 0);
     }
 

trunk/ppStack/src/ppStackSources.c

@@ -127 +127 @@
     float airmassTerm = NAN;            // Airmass term
     float sumExpTime = 0.0;             // Sum of the exposure time
+    int numGoodImages = 0;              // Number of good images
     for (int i = 0; i < num; i++) {
+        psArray *sources = sourceLists->data[i]; // Source list
+        psAssert(sources, "Don't have source list %d", i);
+        if (sources->n == 0) {
+            options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] |= PPSTACK_MASK_CAL;
+            continue;
+        }
+        numGoodImages++;
+
         pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT", i); // File of interest
         pmCell *cell = pmFPAviewThisCell(view, file->fpa); // Cell of interest
@@ -145 +154 @@
         psFree(fake);
 #endif
-
 
         float exptime = psMetadataLookupF32(NULL, cell->concepts, "CELL.EXPOSURE"); // Exposure time