Changeset 28304 for branches/czw_branch/20100519/psModules

Timestamp:

Jun 10, 2010, 6:28:51 PM (16 years ago)

Author:

watersc1

Message:

Skycell Summary and stack Association stuff should be finished. I'll merge and do final tests on monday.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• psModules/src/camera/pmFPAfileIO.c (modified) (1 diff)
• psModules/src/config/pmConfigMask.c (modified) (1 diff)
• psModules/src/config/pmConfigMask.h (modified) (4 diffs)
• psModules/src/detrend/pmGainTweak.c (copied) (copied from trunk/psModules/src/detrend/pmGainTweak.c )
• psModules/src/extras/pmVisual.c (modified) (1 diff)
• psModules/src/imcombine/pmSubtraction.c (modified) (2 diffs)
• psModules/src/objects/pmSourceMatch.c (modified) (3 diffs)

branches/czw_branch/20100519/psModules/src/camera/pmFPAfileIO.c

@@ -751 +751 @@
     file->filename = pmFPAfileName(file, view, config);
     if (!file->filename) {
-        psError(PS_ERR_IO, true, "Unable to determine filename");
+        psError(PS_ERR_IO, true, "Unable to determine filename for file %s", file->name);
         return false;
     }

branches/czw_branch/20100519/psModules/src/config/pmConfigMask.c

@@ -8 +8 @@
 
 #include "pmConfigMask.h"
+
+// Structure to hold the properties of a mask value
+typedef struct {
+    char *badMaskName;                  // name for "bad" (i.e., mask me please) pixels
+    char *fallbackName;                 // Fallback name in case a bad mask name is not defined
+    psImageMaskType defaultMaskValue;   // Default value in case a bad mask name and its fallback are not defined
+    bool isBad; // include this value as part of the MASK.VALUE entry (generically bad)
+} pmConfigMaskInfo;
 
 static pmConfigMaskInfo masks[] = {

branches/czw_branch/20100519/psModules/src/config/pmConfigMask.h

@@ -20 +20 @@
 /// @{
 
-// structure to hold the properties of a mask value
-typedef struct {
-    char *badMaskName;                  // name for "bad" (i.e., mask me please) pixels
-    char *fallbackName;                 // Fallback name in case a bad mask name is not defined
-    psImageMaskType defaultMaskValue;   // Default value in case a bad mask name and its fallback are not defined
-    bool isBad; // include this value as part of the MASK.VALUE entry (generically bad)
-} pmConfigMaskInfo;
-
 // pmConfigMaskSetInMetadata examines named mask values and set the bits for maskValue and
 // markValue.  Ensures that the below-named mask values are set, and calculates the mask value
@@ -33 +25 @@
 // name is not found, or the default values if the fallback name is not found.
 bool pmConfigMaskSetInMetadata(psImageMaskType *outMaskValue, // Value of MASK.VALUE, returned
-                               psImageMaskType *outMarkValue, // Value of MARK.VALUE, returned
-                               psMetadata *source  // Source of mask bits
+                               psImageMaskType *outMarkValue, // Value of MARK.VALUE, returned
+                               psMetadata *source  // Source of mask bits
   );
 
@@ -40 +32 @@
 // Get a mask value by name(s)
 psImageMaskType pmConfigMaskGetFromMetadata(psMetadata *source, // Source of masks
-                                            const char *masks // Mask values to get
+                                            const char *masks // Mask values to get
   );
 
 
-// lookup an image mask value by name from a psMetadata, without requiring the entry to 
+// lookup an image mask value by name from a psMetadata, without requiring the entry to
 // be of type psImageMaskType, but verifying that it will fit in psImageMaskType
 psImageMaskType psMetadataLookupImageMaskFromGeneric (bool *status, const psMetadata *md, const char *name);
@@ -50 +42 @@
 // Remove from the header keywords starting with the provided string
 int pmConfigMaskRemoveHeaderKeywords(psMetadata *header, // Header from which to remove keywords
-                                     const char *start // Remove keywords that start with this string
+                                     const char *start // Remove keywords that start with this string
   );
 

branches/czw_branch/20100519/psModules/src/extras/pmVisual.c

@@ -86 +86 @@
 
 
+// ask the user to continue or not.  give up after 2 seconds.
+// XXX add option to turn on/off timeouts?
 bool pmVisualAskUser(bool *plotFlag)
 {
+    struct timeval timeout;
+    fd_set fdSet;
+    int status;
+
     char key[10];
     if (plotFlag) {
-        fprintf (stdout, "[c]ontinue? [s]kip the rest of these plots? [a]bort all visual plots? (c) ");
+        fprintf (stderr, "[p]ause? [c]ontinue? [s]kip the rest of these plots? [a]bort all visual plots? (c) ");
     } else {
-        fprintf (stdout, "[c]ontinue? [a]bort all visual plots? (c) ");
-    }
-    if (!fgets(key, 8, stdin)) {
-        psWarning("Unable to read option");
-    }
-    if (plotFlag && (key[0] == 's')) {
-        *plotFlag = false;
-    }
-    if (key[0] == 'a') {
-        isVisual = false;
+        fprintf (stderr, "[p]ause? [c]ontinue? [a]bort all visual plots? (c) ");
+    }
+
+    /* Wait up to 1.0 second for a response, then continue */
+    timeout.tv_sec = 2;
+    timeout.tv_usec = 0;
+
+    FD_ZERO (&fdSet);
+    FD_SET (STDIN_FILENO, &fdSet);
+
+    status = select (1, &fdSet, NULL, NULL, &timeout);
+    if (status <= 0) {
+        fprintf (stderr, "\n");
+        return true; // if no data, give up
+    }
+
+    while (true) {
+        if (!fgets(key, 8, stdin)) {
+            psWarning("Unable to read option");
+        }
+        switch (key[0]) {
+          case 's':
+            if (plotFlag) *plotFlag = false;
+            *plotFlag = false;
+            return true;
+          case 'a':
+            isVisual = false;
+            return true;
+          case 'c':
+          case '\n':
+            return true;
+          default:
+            break;
+        }
+        
+        if (plotFlag) {
+            fprintf (stderr, "[c]ontinue? [s]kip the rest of these plots? [a]bort all visual plots? (c) ");
+        } else {
+            fprintf (stderr, "[c]ontinue? [a]bort all visual plots? (c) ");
+        }
     }
     return true;

branches/czw_branch/20100519/psModules/src/imcombine/pmSubtraction.c

@@ -32 +32 @@
 #define MIN_SAMPLE_STATS    7           // Minimum number to use sample statistics; otherwise use quartiles
 #define USE_KERNEL_ERR                  // Use kernel error image?
+#define NUM_COVAR_POS 5                 // Number of positions for covariance calculation
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1328 +1329 @@
     // This can be fairly involved, so we only do it for a single instance
     // Enable threads for covariance calculation, since we're not threading on top of it.
+    float position[NUM_COVAR_POS] = { -1.0, -0.5, 0.0, +0.5, +1.0 }; // Positions for covariance calculations
     oldThreads = psImageCovarianceSetThreads(true);
     if (kernels->mode == PM_SUBTRACTION_MODE_1 || kernels->mode == PM_SUBTRACTION_MODE_DUAL) {
-        psKernel *kernel = pmSubtractionKernel(kernels, 0.0, 0.0, false); // Convolution kernel
-        psKernelTruncate(kernel, covarFrac);
-        out1->covariance = psImageCovarianceCalculate(kernel, ro1->covariance);
-        psFree(kernel);
+        psArray *covars = psArrayAlloc(PS_SQR(NUM_COVAR_POS)); // Covariances
+        for (int y = 0, i = 0; y < NUM_COVAR_POS; y++) {
+            for (int x = 0; x < NUM_COVAR_POS; x++, i++) {
+                psKernel *kernel = pmSubtractionKernel(kernels, position[x], position[y],
+                                                       false); // Convolution kernel
+                psKernelTruncate(kernel, covarFrac);
+                covars->data[i] = psImageCovarianceCalculate(kernel, ro1->covariance);
+                psFree(kernel);
+            }
+        }
+        out1->covariance = psImageCovarianceAverage(covars);
+        psFree(covars);
     }
     if (kernels->mode == PM_SUBTRACTION_MODE_2 || kernels->mode == PM_SUBTRACTION_MODE_DUAL) {
-        psKernel *kernel = pmSubtractionKernel(kernels, 0.0, 0.0,
-                                               kernels->mode == PM_SUBTRACTION_MODE_DUAL); // Conv. kernel
-        psKernelTruncate(kernel, covarFrac);
-        out2->covariance = psImageCovarianceCalculate(kernel, ro2->covariance);
-        psFree(kernel);
+        psArray *covars = psArrayAlloc(PS_SQR(NUM_COVAR_POS)); // Covariances
+        for (int y = 0, i = 0; y < NUM_COVAR_POS; y++) {
+            for (int x = 0; x < NUM_COVAR_POS; x++, i++) {
+                psKernel *kernel = pmSubtractionKernel(kernels, position[x], position[y],
+                                                       kernels->mode == PM_SUBTRACTION_MODE_DUAL); // Convolution kernel
+                psKernelTruncate(kernel, covarFrac);
+                covars->data[i] = psImageCovarianceCalculate(kernel, ro2->covariance);
+                psFree(kernel);
+            }
+        }
+        out2->covariance = psImageCovarianceAverage(covars);
+        psFree(covars);
     }
     psImageCovarianceSetThreads(oldThreads);

branches/czw_branch/20100519/psModules/src/objects/pmSourceMatch.c

@@ -280 +280 @@
     psFree(boundsMaster);
 
+    if (!matches) {
+        psError(PM_ERR_OBJECTS, true, "No matches made.");
+        return NULL;
+    }
+
     if (cullSingles) {
         // Now cull the matches that contain only a single star
@@ -300 +305 @@
     }
 
+    if (matches->n == 0) {
+        psError(PM_ERR_OBJECTS, true, "No matches made.");
+        psFree(matches);
+        return NULL;
+    }
+
     return matches;
 }
@@ -311 +322 @@
     psArray *matches = pmSourceMatchSources(sourceArrays, radius, false); // Source matches
     if (!matches) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to match source lists.");
+        psError(psErrorCodeLast(), false, "Unable to match source lists.");
         return NULL;
     }