Changeset 30118 for branches/czw_branch/20101203/psLib

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psLib/src/fits/psFitsImage.c (modified) (1 diff)
• psLib/src/imageops (modified) (1 prop)
• psLib/src/imageops/psImageMapFit.c (modified) (13 diffs)
• psLib/src/imageops/psImageMapFit.h (modified) (4 diffs)
• psLib/src/jpeg/psImageJpeg.c (modified) (3 diffs)
• psLib/src/math/psStats.c (modified) (7 diffs)
• psLib/src/sys/psSlurp.c (modified) (6 diffs)
• psLib/src/sys/psSlurp.h (modified) (2 diffs)
• psLib/src/sys/psString.c (modified) (1 diff)
• psLib/src/sys/psString.h (modified) (2 diffs)
• psLib/src/types/psMetadata.c (modified) (4 diffs)
• psLib/src/types/psMetadataConfig.c (modified) (1 diff)
• psLib/src/types/psMetadataConfig.h (modified) (2 diffs)
• psLib/test/astro/tst_psCoord.c (deleted)
• psLib/test/astro/tst_psCoord01.c (deleted)
• psLib/test/astro/tst_psCoord02.c (deleted)
• psLib/test/astro/tst_psEarthOrientation.c (deleted)
• psLib/test/astro/tst_psSphereOps.c (deleted)
• psLib/test/astro/tst_psTime_01.c (deleted)
• psLib/test/astro/tst_psTime_02.c (deleted)
• psLib/test/astro/tst_psTime_03.c (deleted)
• psLib/test/astro/tst_psTime_04.c (deleted)
• psLib/test/db/tst_psDB.c (deleted)
• psLib/test/imageops (modified) (1 prop)
• psLib/test/imageops/Makefile.am (modified) (1 diff)
• psLib/test/imageops/tap_psImageInterpolate3.c (copied) (copied from trunk/psLib/test/imageops/tap_psImageInterpolate3.c )
• psLib/test/math (modified) (1 prop)
• psLib/test/math/data/yraw_01.dat (copied) (copied from trunk/psLib/test/math/data/yraw_01.dat )
• psLib/test/math/data/yraw_02.dat (copied) (copied from trunk/psLib/test/math/data/yraw_02.dat )
• psLib/test/math/data/yraw_03.dat (copied) (copied from trunk/psLib/test/math/data/yraw_03.dat )
• psLib/test/math/data/yraw_04.dat (copied) (copied from trunk/psLib/test/math/data/yraw_04.dat )
• psLib/test/math/mana.stats.pro (copied) (copied from trunk/psLib/test/math/mana.stats.pro )
• psLib/test/math/tap_psStats_Sample_01.c (modified) (5 diffs)
• psLib/test/types/tap_psMetadataConfigWrite.c (modified) (5 diffs)

branches/czw_branch/20101203/psLib/src/fits/psFitsImage.c

@@ -900 +900 @@
 
     if (nAxis == 2) {
+        psImage *image = psFitsReadImage(fits, region, 0);
+        if (!image) {
+            psFitsError(status, true, "Could not read image into cube");
+            return NULL;
+        }
         psArray *images = psArrayAlloc(1); // Single image plane
-        images->data[0] = psFitsReadImage(fits, region, 0);
+        images->data[0] = image;
         return images;
     }

branches/czw_branch/20101203/psLib/src/imageops/psImageMapFit.c

@@ -48 +48 @@
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit(psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
+bool psImageMapFit(bool *pGoodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                    const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
     // XXX Add Asserts
+
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -81 +83 @@
         map->map->data.F32[0][0]   = psStatsGetValue(map->stats, mean);
         map->error->data.F32[0][0] = psStatsGetValue(map->stats, stdev);
+        if (isfinite(map->map->data.F32[0][0]) && isfinite( map->error->data.F32[0][0])) {
+            *pGoodFit = true;
+        }
         return true;
     }
@@ -86 +91 @@
     if (Nx == 1) {
         bool status;
-        status = psImageMapFit1DinY (map, mask, maskValue, x, y, f, df);
+        status = psImageMapFit1DinY (pGoodFit, map, mask, maskValue, x, y, f, df);
         return status;
     }
     if (Ny == 1) {
         bool status;
-        status = psImageMapFit1DinX (map, mask, maskValue, x, y, f, df);
+        status = psImageMapFit1DinX (pGoodFit, map, mask, maskValue, x, y, f, df);
         return status;
     }
@@ -310 +315 @@
 
     if (!psMatrixGJSolve(A, B)) {
-        psError(PS_ERR_UNKNOWN, false, "Could not solve linear equations.  Returning NULL.\n");
         psFree (A);
         psFree (B);
-        return false;
+        return true;
     }
 
@@ -337 +341 @@
     psFree (Empty);
 
+    *pGoodFit = true;
     return true;
 }
 
 // measure residuals on each pass and clip outliers based on stats
-bool psImageMapClipFit(psImageMap *map, psStats *stats, psVector *inMask, psVectorMaskType maskValue,
+bool psImageMapClipFit(bool *pGoodFit, psImageMap *map, psStats *stats, psVector *inMask, psVectorMaskType maskValue,
                        const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -351 +356 @@
     psAssert(f, "impossible");
 
+    *pGoodFit = false;
+
     // the user supplies one of various stats option pairs,
     // determine the desired mean and stdev STATS options:
@@ -393 +400 @@
         psTrace("psLib.imageops", 6, "Loop iteration %d.  Calling psImageMapFit()\n", N);
         psS32 Nkeep = 0;
-        if (!psImageMapFit(map, mask, maskValue, x, y, f, df)) {
+        if (!psImageMapFit(pGoodFit, map, mask, maskValue, x, y, f, df)) {
             psError(PS_ERR_UNKNOWN, false, "Could not fit image map.\n");
             psFree(resid);
@@ -399 +406 @@
             return false;
         }
+        if (!*pGoodFit) {
+            psWarning ("bad fit to image map, try something else");
+            return true;
+        }
 
         psVector *fit = psImageMapEvalVector(map, mask, maskValue, x, y);
@@ -454 +465 @@
     psFree(resid);
     if (!inMask) psFree (mask);
+    *pGoodFit = true; // XXX probably don't need to set this (set by psImageMapFit)
     return true;
 }
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit1DinY(psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
+bool psImageMapFit1DinY(bool *pGoodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                         const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
     // XXX Add Asserts
     assert (map->binning->nXruff == 1);
+
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -578 +592 @@
 
     if (!psMatrixGJSolve(A, B)) {
-        psError(PS_ERR_UNKNOWN, false, "Could not solve linear equations.\n");
         psFree (A);
         psFree (B);
         psFree (Empty);
-        return false;
+        return true;
     }
 
@@ -602 +615 @@
     psFree (Empty);
 
+    *pGoodFit = true;
     return true;
 }
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit1DinX(psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
+bool psImageMapFit1DinX(bool *pGoodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                         const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
     // XXX Add Asserts
     assert (map->binning->nYruff == 1);
+
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -726 +742 @@
 
     if (!psMatrixGJSolve(A, B)) {
-        psError(PS_ERR_UNKNOWN, false, "Could not solve linear equations..\n");
         psFree (A);
         psFree (B);
         psFree (Empty);
-        return false;
+        return true;
     }
 
@@ -750 +765 @@
     psFree (Empty);
 
+    *pGoodFit = true;
     return true;
 }

branches/czw_branch/20101203/psLib/src/imageops/psImageMapFit.h

@@ -8 +8 @@
 
 // fit the image map to a set of points
-bool psImageMapFit(psImageMap *map,
+bool psImageMapFit(bool *pGoodFit, 
+                   psImageMap *map,
                    const psVector *mask,
                    psVectorMaskType maskValue, // 
@@ -18 +19 @@
 
 // fit the image map to a set of points
-bool psImageMapClipFit(psImageMap *map,
+bool psImageMapClipFit(bool *pGoodFit, 
+                       psImageMap *map,
                        psStats *stats,
                        psVector *mask,  // WARNING: Mask is modified!
@@ -28 +30 @@
     );
 
-bool psImageMapFit1DinY(psImageMap *map,
+bool psImageMapFit1DinY(bool *pGoodFit, 
+                        psImageMap *map,
                         const psVector *mask,
                         psVectorMaskType maskValue,
@@ -37 +40 @@
     );
 
-bool psImageMapFit1DinX(psImageMap *map,
+bool psImageMapFit1DinX(bool *pGoodFit, 
+                        psImageMap *map,
                         const psVector *mask,
                         psVectorMaskType maskValue,

branches/czw_branch/20101203/psLib/src/jpeg/psImageJpeg.c

@@ -167 +167 @@
   int dy = image->numRows;
   
-  bDrawBuffer *bdbuf = bDrawBufferCreate(dx, dy);
+  int Npalette;
+  png_color *palette = KapaPNGPalette (&Npalette);
+
+  bDrawBuffer *bdbuf = bDrawBufferCreate(dx, dy, 1, palette, Npalette);
 
   return bdbuf;
@@ -180 +183 @@
   int dy = bdbuf->Ny;
 
-  int Npalette;
-  png_color *palette = KapaPNGPalette (&Npalette);
+  png_color *palette = bdbuf->palette;
   bDrawColor white = KapaColorByName ("white");
   for (int j = 0; j < dy; j++) {
@@ -336 +338 @@
 
     // set the scalebar labels
+    int Npalette;
+    png_color *palette = KapaPNGPalette (&Npalette);
+
     char string[64];
-    bDrawBuffer *labels = bDrawBufferCreate(dx, PS_JPEG_LABELPAD);
+    bDrawBuffer *labels = bDrawBufferCreate(dx, PS_JPEG_LABELPAD, 1, palette, Npalette);
     SetRotFont ("helvetica", 8);
-    bDrawSetBuffer(labels);
     sprint_double (string, options->min);
-    bDrawRotText(2, 2, string, 2, 0.0);
+    bDrawRotText(labels, 2, 2, string, 2, 0.0);
     sprint_double (string, options->max);
-    bDrawRotText(dx - 2, 2, string, 0, 0.0);
+    bDrawRotText(labels, dx - 2, 2, string, 0, 0.0);
     sprint_double (string, 0.5*(options->min + options->max));
-    bDrawRotText(0.5*dx, 2, string, 1, 0.0);
+    bDrawRotText(labels, 0.5*dx, 2, string, 1, 0.0);
     psImageJpegOverlayDraw(jpegImage, labels, 0, offset);
+    bDrawBufferFree(labels);
   }
     

branches/czw_branch/20101203/psLib/src/math/psStats.c

@@ -827 +827 @@
         // values; nearly bi-modal distribution).  if so, keep only points within 5? 10?
         // bins of that excess bin:
-        int nMaxBin = 0;
+        int nMaxBin = histogram->nums->data.F32[0];
         int iMaxBin = 0;
         for (long i = 1; i < histogram->nums->n; i++) {
@@ -843 +843 @@
                 if (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskVal) continue;
                 bool invalid = false;
-                invalid |= (myVector->data.F32[i] <= minKeep);
-                invalid |= (myVector->data.F32[i] >= maxKeep);
+                invalid |= (myVector->data.F32[i] < minKeep);
+                invalid |= (myVector->data.F32[i] > maxKeep);
                 invalid |= (!isfinite(myVector->data.F32[i]));
                 if (!invalid) continue;
@@ -852 +852 @@
 
             if (nInvalid) {
-              psTrace(TRACE, 6, "data is concentrated in a single bin, masking %d extreme outliers and retrying\n", nInvalid);
+              psTrace(TRACE, 6, "data is concentrated in a single bin (%d = %f - %f), masking %d extreme outliers and retrying\n", 
+                      iMaxBin, histogram->bounds->data.F32[iMaxBin], histogram->bounds->data.F32[iMaxBin+1], nInvalid);
               psFree(histogram);
               psFree(cumulative);
@@ -1108 +1109 @@
     // If the mean is NAN, then generate a warning and set the stdev to NAN.
     if (isnan(stats->robustMedian)) {
-        stats->fittedStdev = NAN;
-        stats->fittedStdev = NAN;
+        stats->fittedMean = NAN;
+        stats->fittedStdev = NAN;
+        stats->results |= PS_STAT_FITTED_MEAN;
+        stats->results |= PS_STAT_FITTED_STDEV;
+        return true;
+    }
+
+    if (stats->robustStdev <= FLT_EPSILON) {
+        stats->fittedMean = stats->robustMedian;
+        stats->fittedStdev = stats->robustStdev;
+        stats->results |= PS_STAT_FITTED_MEAN;
+        stats->results |= PS_STAT_FITTED_STDEV;
         return true;
     }
@@ -1289 +1300 @@
     // If the mean is NAN, then generate a warning and set the stdev to NAN.
     if (isnan(stats->robustMedian)) {
-        stats->fittedStdev = NAN;
-        stats->fittedStdev = NAN;
-        psTrace(TRACE, 4, "---- %s() end ----\n", __func__);
+        stats->fittedMean = NAN;
+        stats->fittedStdev = NAN;
+        stats->results |= PS_STAT_FITTED_MEAN_V2;
+        stats->results |= PS_STAT_FITTED_STDEV_V2;
+        return true;
+    }
+
+    if (stats->robustStdev <= FLT_EPSILON) {
+        stats->fittedMean = stats->robustMedian;
+        stats->fittedStdev = stats->robustStdev;
+        stats->results |= PS_STAT_FITTED_MEAN_V2;
+        stats->results |= PS_STAT_FITTED_STDEV_V2;
         return true;
     }
@@ -1486 +1506 @@
     // If the mean is NAN, then generate a warning and set the stdev to NAN.
     if (isnan(stats->robustMedian)) {
-        stats->fittedStdev = NAN;
-        stats->fittedStdev = NAN;
-        psTrace(TRACE, 4, "---- %s() end ----\n", __func__);
+        stats->fittedMean = NAN;
+        stats->fittedStdev = NAN;
+        stats->results |= PS_STAT_FITTED_MEAN_V3;
+        stats->results |= PS_STAT_FITTED_STDEV_V3;
+        return true;
+    }
+
+    if (stats->robustStdev <= FLT_EPSILON) {
+        stats->fittedMean = stats->robustMedian;
+        stats->fittedStdev = stats->robustStdev;
+        stats->results |= PS_STAT_FITTED_MEAN_V3;
+        stats->results |= PS_STAT_FITTED_STDEV_V3;
         return true;
     }
@@ -1782 +1811 @@
 
     // If the mean is NAN, then generate a warning and set the stdev to NAN.
-    if (isnan(stats->robustMedian)) goto escape;
+    if (isnan(stats->robustMedian)) {
+        stats->fittedMean = NAN;
+        stats->fittedStdev = NAN;
+        stats->results |= PS_STAT_FITTED_MEAN_V4;
+        stats->results |= PS_STAT_FITTED_STDEV_V4;
+        return true;
+    }
+
+    if (stats->robustStdev <= FLT_EPSILON) {
+        stats->fittedMean = stats->robustMedian;
+        stats->fittedStdev = stats->robustStdev;
+        stats->results |= PS_STAT_FITTED_MEAN_V4;
+        stats->results |= PS_STAT_FITTED_STDEV_V4;
+        return true;
+    }
 
     float guessStdev = stats->robustStdev;  // pass the guess sigma

branches/czw_branch/20101203/psLib/src/sys/psSlurp.c

@@ -27 +27 @@
 #include "psMemory.h"
 
-#define SLURP_SIZE 4096
+# define SLURP_SIZE 4096
+
+# if (PS_SLURP_GZIP) 
+
+psString psSlurpFD(int fd) {
+
+ gzFile file = gzdopen (fd, "r");
+ if (file == Z_NULL) {
+     psError(PS_ERR_IO, true, "Failed to open file\n");
+     return NULL;
+ }
+ 
+ psString str = psSlurpGZIP(file);
+
+ return str;
+}
+
+# else
 
 psString psSlurpFD(int fd)
@@ -38 +55 @@
         // increase the allocated string size
         size += SLURP_SIZE;
-        str = psRealloc(str, size);
+        str = psStringRealloc(str, size);
 
         // read a block from the stream
@@ -59 +76 @@
     return str;
 }
+# endif
 
+# if (PS_SLURP_GZIP)
+psString psSlurpGZIP(gzFile fd)
+{
+    psString str = NULL;                // String to which to write
+    size_t size  = 1;                   // bytes allocated -  make sure there is room for '\0'
+    size_t used = 0;                    // bytes actually used
+    ssize_t bytes;                      // Number of bytes read
+    do {
+        // increase the allocated string size
+        size += SLURP_SIZE;
+        str = psStringRealloc(str, size);
+
+        // read a block from the stream
+        bytes = gzread(fd, str + used, SLURP_SIZE);
+        if (bytes < 0) {
+            // it's an error
+            psError(PS_ERR_IO, true, "slurp failed on read");
+            psFree(str);
+            return NULL;
+        }
+
+        // Increase the size of the known string
+        used += bytes;
+
+    } while (bytes != 0);
+
+    // append '\0' to the end of the string
+    str[used] = '\0';
+
+    return str;
+}
+# endif
 
 psString psSlurpFile(FILE *stream)
@@ -70 +120 @@
 {
     PS_ASSERT_PTR_NON_NULL(filename, NULL);
+    
+# if (PS_SLURP_GZIP)
+    gzFile fd = gzopen(filename, "r");
+    if (fd == Z_NULL) {
+        psError(PS_ERR_IO, true, "Failed to open specified file, %s\n", filename);
+        return NULL;
+    }
+    psString text = psSlurpGZIP(fd);
+
+    if (gzclose(fd) != Z_OK) {
+        psError(PS_ERR_IO, true, "Failed to close specified file, %s\n", filename);
+        psFree(text);
+        return NULL;
+    }
+
+# else
 
     int fd = open(filename, O_RDONLY);
@@ -76 +142 @@
         return NULL;
     }
-
     psString text = psSlurpFD(fd);
 
@@ -84 +149 @@
         return NULL;
     }
+# endif
 
     return text;

branches/czw_branch/20101203/psLib/src/sys/psSlurp.h

@@ -12 +12 @@
 
 #include <psString.h>
+
+# define PS_SLURP_GZIP 1
+
+# if (PS_SLURP_GZIP) 
+# include <zlib.h>
+# endif
 
 /// @addtogroup FileIO Input/Output
@@ -31 +37 @@
                     );
 
+# if (PS_SLURP_GZIP)
+psString psSlurpGZIP(gzFile fd);
+# endif
+
 /// @}
 #endif

branches/czw_branch/20101203/psLib/src/sys/psString.c

@@ -48 +48 @@
     psString string = p_psAlloc(file, lineno, func, nChar + 1);
     psMemSetDeallocator(string, (psFreeFunc)stringFree);
+
+    return string;
+}
+
+
+psString p_psStringRealloc(const char *file,
+                           unsigned int lineno,
+                           const char *func,
+                           psString string,
+                           size_t nChar)
+{
+    if (!string) {
+        string = p_psAlloc(file, lineno, func, nChar + 1);
+        psMemSetDeallocator(string, (psFreeFunc)stringFree);
+    } else {
+        string = p_psRealloc(file, lineno, func, string, nChar + 1);
+    }
 
     return string;

branches/czw_branch/20101203/psLib/src/sys/psString.h

@@ -40 +40 @@
 #define PS_FILE_LINE p_psFileLine(__FILE__,__LINE__)
 
-
 /** Allocates a new psString.
  *
@@ -60 +59 @@
 #endif // ifdef DOXYGEN
 
+/** Reallocate an existing psString (or alloc if not existent)
+ *
+ *  @return psString:       string of length n.
+ */
+#ifdef DOXYGEN
+psString psStringRealloc(
+    psString string,
+    size_t nChar                        ///< Size of psString to allocate.
+);
+#else // ifdef DOXYGEN
+psString p_psStringRealloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    psString string,                    ///< supplied string or NULL
+    size_t nChar                        ///< Size of psString to allocate.
+) PS_ATTR_MALLOC;
+#define psStringRealloc(string, nChar)                          \
+    p_psStringRealloc(__FILE__, __LINE__, __func__, string, nChar)
+#endif // ifdef DOXYGEN
 
 /** Checks the type of a particular pointer.

branches/czw_branch/20101203/psLib/src/types/psMetadata.c

@@ -1371 +1371 @@
             break;
         case PS_DATA_S64:
-            fprintf(fd, "%jd\n", item->data.S64);
+            fprintf(fd, "%" PRId64 "\n", item->data.S64);
             break;
         case PS_DATA_U8:
@@ -1383 +1383 @@
             break;
         case PS_DATA_U64:
-            fprintf(fd, "%ju\n", item->data.U64);
+            fprintf(fd, "%" PRIu64 "\n", item->data.U64);
             break;
         case PS_DATA_F32:
@@ -1458 +1458 @@
               fprintf(fd, "U64  ");
               for (int i = 0; i < vector->n; i++) {
-                  fprintf(fd, "%ju ", vector->data.U64[i]);
+                  fprintf(fd, "%" PRIu64, vector->data.U64[i]);
               }
               fprintf(fd, "\n");
@@ -1486 +1486 @@
               fprintf(fd, "S64  ");
               for (int i = 0; i < vector->n; i++) {
-                  fprintf(fd, "%jd ", vector->data.S64[i]);
+                  fprintf(fd, "%" PRId64, vector->data.S64[i]);
               }
               fprintf(fd, "\n");

branches/czw_branch/20101203/psLib/src/types/psMetadataConfig.c

@@ -1630 +1630 @@
 }
 
-
-bool psMetadataConfigWrite(psMetadata *md,
-                           const char *filename)
-{
-    PS_ASSERT_METADATA_NON_NULL(md, NULL);
-    PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
-    FILE *file;
-    if ( !(file = fopen(filename, "w")) ) {
-        psError(PS_ERR_IO, true,
-                "Failed to open specified file, %s\n", filename);
-        return false;
-    }
-    psString fileString = NULL;
-    fileString = psMetadataConfigFormat(md);
-    if (fileString == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, false,
-                "psMetadataConfigFormat returned NULL.\n");
-        return false;
-    }
-    if (fprintf(file, "%s", fileString) != strlen(fileString)) {
-        psError(PS_ERR_IO, true, "Failed to write contents of configuration file %s", filename);
-        psFree(fileString);
-        fclose(file);
-        return false;
+bool psMetadataConfigWrite(psMetadata *md, const char *filename, const char *compress)
+{
+  PS_ASSERT_METADATA_NON_NULL(md, NULL);
+  PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
+
+  psString fileString = NULL;
+  fileString = psMetadataConfigFormat(md);
+  if (fileString == NULL) {
+    psError(PS_ERR_BAD_PARAMETER_NULL, false, "psMetadataConfigFormat returned NULL.\n");
+    return false;
+  }
+
+  if (compress) {
+    if (strlen(compress) > 2) {
+      psError(PS_ERR_BAD_PARAMETER_VALUE, true, "invalid compression options %s", compress);
+      psFree(fileString);
+      return false;
+    }
+    char modeString[4];
+    snprintf (modeString, 4, "w%s", compress);
+
+    gzFile file = gzopen(filename, modeString);
+    if (file == Z_NULL) {
+      psError(PS_ERR_IO, true, "Failed to open specified file, %s\n", filename);
+      psFree(fileString);
+      return false;
+    }
+
+    int nbytes = gzwrite (file, fileString, strlen(fileString));
+    if (nbytes != strlen(fileString)) {
+      psError(PS_ERR_IO, true, "Failed to write contents of configuration file %s", filename);
+      psFree(fileString);
+      gzclose(file);
+      return false;
+    }
+    psFree(fileString);
+    if (gzclose(file) != Z_OK) {
+      psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
+      return false;
+    }
+  } else {
+    FILE *file = fopen(filename, "w");
+    if (file == NULL) {
+      psError(PS_ERR_IO, true, "Failed to open specified file, %s\n", filename);
+      psFree(fileString);
+      return false;
+    }
+
+    int nbytes = fwrite(fileString, 1, strlen(fileString), file);
+    if (nbytes != strlen(fileString)) {
+      psError(PS_ERR_IO, true, "Failed to write contents of configuration file %s", filename);
+      psFree(fileString);
+      fclose(file);
+      return false;
     }
     psFree(fileString);
     if (fclose(file) == EOF) {
-        psError(PS_ERR_IO, true,
-                "Failed to close file, %s\n", filename);
-        return false;
-    }
-    return true;
+      psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
+      return false;
+    }
+  }
+  return true;
 }
 

branches/czw_branch/20101203/psLib/src/types/psMetadataConfig.h

@@ -33 +33 @@
  *  a string, the formatting command must also be for a string. If the
  *  metadata type is any other data type, printing is not allowed.
+ *  Currently, this function does not compress the output file
  *
  * @return psMetadataItem* :    Pointer metadata item.
@@ -85 +86 @@
 bool psMetadataConfigWrite(
     psMetadata *md,                    ///< The metadata to convert
-    const char *filename               ///< Name of file to write
+    const char *filename,              ///< Name of file to write
+    const char *compress               ///< Output compression options 
 );
 
 /** Converts a psMetadata structure (including any nested psMetadata) into a
  *  configuration file formatted string that is written a file stream.
+ *  Currently, this function does not compress the output file
  *
  *  @return bool:       True if successful, otherwise false.

branches/czw_branch/20101203/psLib/test/imageops

@@ -27 +27 @@
 convolutionBench
 tap_psImageInterpolate2
+tap_psImageInterpolate3
 tap_psImageGeomManip
 tap_psImageMaskOps

@@ -27 +27 @@
 convolutionBench
 tap_psImageInterpolate2
+tap_psImageInterpolate3
 tap_psImageGeomManip
 tap_psImageMaskOps

branches/czw_branch/20101203/psLib/test/imageops/Makefile.am

@@ -22 +22 @@
         tap_psImagePixelExtract \
         tap_psImageInterpolate2 \
+        tap_psImageInterpolate3 \
         tap_psImageMap \
         tap_psImageMapFit \

branches/czw_branch/20101203/psLib/test/math/tap_psStats_Sample_01.c

@@ -487 +487 @@
                          };
 
+static float yraw_04[] = {
+    -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, -1.000000, -1.000000,
+    0.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000,
+    -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -0.963289,
+    -1.000000, 0.000000, -1.000000, -1.000000, -0.915174, -1.000000, -1.000000, -1.000000,
+    -1.000000, -1.000000, 0.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000,
+    -1.000000, -1.000000, -1.000000, -0.853025, 0.000000, -1.000000, -1.000000, -1.000000,
+    -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -0.989926, -1.000000, -1.000000,
+    -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -0.834902, -1.000000, -1.000000,
+    -0.942985, -1.000000, -1.000000, 0.000000, -1.000000, -1.000000, -1.000000, -1.000000,
+    -1.000000, -1.000000, -0.990081, -1.000000, -0.990456, -0.814654, -1.000000, -1.000000,
+    -1.000000, -1.000000, 0.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000,
+    -0.968021, -1.000000, -1.000000, 0.000000, -1.000000, -1.000000, -0.993967, -0.957540,
+    -0.894533, -0.958363, -1.000000, -1.000000, -1.000000, -0.988915, -1.000000, -1.000000,
+    -1.000000, -1.000000, -1.000000, -1.000000, -0.985367, -1.000000, -0.972040, -1.000000,
+    -1.000000, -1.000000, 0.000000, -1.000000, -0.882278, -1.000000, -1.000000, -1.000000,
+    -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000,
+    -1.000000, -0.962575, -0.976843, -0.998926, -1.000000, -0.914090, 0.000000, -0.957808,
+    -1.000000, -1.000000, -1.000000, 0.000000, -0.902593, -1.000000, -1.000000, -1.000000,
+    -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -0.975404,
+    -1.000000, 0.000000, -0.984627, -1.000000, -0.969547, -0.851295, -1.000000, -0.988146,
+    -1.000000, 0.000000, -1.000000, -0.993753, -0.861851, -1.000000, -0.980836, -0.979644,
+    -1.000000, -1.000000, -1.000000, -0.995401, -1.000000, -1.000000, -1.000000, -1.000000,
+    -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000,
+    0.000000, -1.000000, -0.990123, -0.944934, -1.000000, 0.000000, -1.000000, -0.952198,
+    -1.000000, -1.000000, -0.960814, -1.000000, -1.000000, -1.000000, -0.956806, -1.000000,
+    0.000000, -0.991778, -1.000000, -1.000000, -1.000000, -1.000000, 0.000000, -1.000000,
+    -0.977640, -1.000000, -1.000000, 0.000000, -1.000000, -0.977630, -1.000000, -0.974242,
+    -1.000000, -1.000000, -0.940085, -0.930729, -1.000000, -1.000000, 0.000000, -1.000000,
+    -1.000000, -0.933695, -1.000000, -0.932306, -1.000000, -1.000000, -1.000000, -0.836774,
+    -0.931762, -0.926990, -0.861895, -1.000000, -0.922505, -1.000000, -0.956420, -0.998768,
+    -0.974626, -0.964573, -1.000000, -0.933995, -1.000000, -0.995117, -1.000000, -1.000000,
+    0.000000, 0.000000, -1.000000, -0.955537, -0.996360, -0.988015, -1.000000, -1.000000,
+    -0.963953, -0.920429, -0.955252, -0.950946, -1.000000, -1.000000, -1.000000, -0.979526,
+    -1.000000, -1.000000, -0.997193, -1.000000, -1.000000, 0.000000, -1.000000, -1.000000,
+    -1.000000, -0.893445, -1.000000, -1.000000, -0.997704, -1.000000, -1.000000, -0.952295,
+    -1.000000, 0.000000, -0.928042, -1.000000, -1.000000, -0.994029, -0.919350, -1.000000,
+    -1.000000, -1.000000, -1.000000, -0.958966, -0.806458, -0.903843, -1.000000, -1.000000,
+    -1.000000, -1.000000, -1.000000, -1.000000, 0.000000, -0.989002, 0.000000, -0.999874,
+    -1.000000, 0.000000, -1.000000, 0.000000, -0.923556, -0.906242, -0.923497, -0.997873,
+    -1.000000, -1.000000, 0.000000, -0.960376, -0.998760, -1.000000, 0.000000, -1.000000,
+    -0.852141, -1.000000, -0.957442, -0.942000, -1.000000, -1.000000, -1.000000, -1.000000,
+    -1.000000, -1.000000, -0.996748, -0.997676, -0.976159, -0.951572, -1.000000, -0.993083,
+    -0.715375, -0.997984, -1.000000, -0.962484, -0.996733, -1.000000, -1.000000, -0.953423,
+    -1.000000, -0.882232, -1.000000, -1.000000, -0.944493, -1.000000, -0.979617, -1.000000,
+    -0.990002, -1.000000, -0.844745, -0.945080, -1.000000, -1.000000, -0.904816, -1.000000,
+    -0.986999, -1.000000, -0.854941, -1.000000, -0.946096, -0.977678, -1.000000, -0.955933,
+    -0.979545, -1.000000, -1.000000, -0.863616, -0.973953, -0.996599, -0.990304, -0.978263,
+    -1.000000, -0.967798, -0.912566, 0.000000, -1.000000, -1.000000, -0.990321, -0.995921,
+    -1.000000, -1.000000, -1.000000, -0.927030, -0.886393, -0.987297, -1.000000, -1.000000,
+    -0.987206, -0.978084, -1.000000, -0.923876, -0.957539, -0.991587, -0.819295, -1.000000,
+    -0.985077, -1.000000, 0.000000, -1.000000, -1.000000, -0.822353, -1.000000, -1.000000,
+    -0.987783, -1.000000, -0.909520, -1.000000, -0.932334, -0.991847, -1.000000, -0.885318,
+    -0.945695, -0.977144, -0.989444, -0.887085, -0.891662, -0.894193, -1.000000, 0.000000,
+    -1.000000, -0.917484, -1.000000, -0.892801, -1.000000, -0.963580, -0.869279, -0.965420,
+    -0.906966, -0.929646, -0.981315, -1.000000, -1.000000, -0.749674, -1.000000, -0.886804,
+    -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -1.000000, -0.970826, -0.909766,
+    -1.000000, -0.910406, -0.983636, -1.000000, -0.961209, -0.935273, -1.000000, -0.989806,
+    0.000000, -0.981563, -0.989701, -0.915626, -0.997493, -0.981429, -1.000000, -0.964583,
+    -1.000000, -0.930216, -0.737797, -1.000000, -0.944314, -0.999998, -0.999611, -0.945788,
+    -0.773886, -0.848979, -0.980186, -1.000000, -1.000000, 0.000000, -0.951392, -0.993398,
+    -0.931889, -0.991680, -0.959021, -0.904240, -1.000000, -0.983561, -0.821324, 0.000000,
+    0.000000, -1.000000, -0.925782, -0.841267, -1.000000, -0.907313, -1.000000, -0.990704,
+    -1.000000, -1.000000, -0.936372, -0.885059
+};
+
 int main (void)
 {
     plan_tests(21);
 
-//    diag("psStats Tests with sample SDSS data from RHL and Megacam from EAM");
-//    diag("this file does not yet define a specific test");
-//    diag("the fitted mean is currently wrong for these two data sets");
-
-    {
+    // float **yraw = {yraw_01, yraw_02, yraw_03, yraw_04, NULL};
+
+    if (1) {
+        diag("sample 1 : problem with integer-binned data driven to tiny sigma values");
+
         psMemId id = psMemGetId();
 
-//        diag("sample 1 : problem with integer-binned data driven to tiny sigma values");
         psStats *stats = psStatsAlloc (PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV |
                                        PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV |
@@ -505 +570 @@
                                        PS_STAT_SAMPLE_STDEV | PS_STAT_USE_BINSIZE);
         stats->binsize = 1.0;
-
 
         // copy data in static array
@@ -533 +597 @@
 
 
-    {
+    if (1) {
         psMemId id = psMemGetId();
 
-//        diag("sample 2");
+        diag("sample 2");
         psStats *stats = psStatsAlloc (PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV |
                                        PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV |
@@ -568 +632 @@
     }
 
-    {
+    if (1) {
         psMemId id = psMemGetId();
 
-//        diag("sample 3");
+        diag("sample 3");
         psStats *stats = psStatsAlloc (PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV |
                                        PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV |
                                        PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV |
                                        PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_MEDIAN |
-                                       PS_STAT_SAMPLE_STDEV | PS_STAT_USE_BINSIZE);
-        stats->binsize = 1.0;
-
+                                       PS_STAT_SAMPLE_STDEV);
 
         // copy data in static array
@@ -605 +667 @@
     }
 
+    {
+        psMemId id = psMemGetId();
+
+        // psTraceSetLevel("psLib.math.vectorRobustStats", 6);
+
+        diag("sample 4");
+        psStats *stats = psStatsAlloc (PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV |
+                                       PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV |
+                                       PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV |
+                                       PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_MEDIAN |
+                                       PS_STAT_SAMPLE_STDEV);
+
+        // copy data in static array
+        int nPts = sizeof(yraw_04) / sizeof (float);
+        psVector *y = psVectorAlloc (nPts, PS_TYPE_F32);
+        for (int i = 0; i < y->n; i++) {
+            y->data.F32[i] = yraw_04[i];
+        }
+
+        psVectorStats (stats, y, NULL, NULL, 1);
+        ok (1, "sample  mean   %f, stdev %f", stats->sampleMean,   stats->sampleStdev);
+        ok (1, "sample  median %f, stdev %f", stats->sampleMedian, stats->sampleStdev);
+        ok (1, "clipped mean   %f, stdev %f", stats->clippedMean,  stats->clippedStdev);
+        ok (1, "robust  median %f, stdev %f", stats->robustMedian, stats->robustStdev);
+        ok (1, "fitted  mean   %f, stdev %f", stats->fittedMean,   stats->fittedStdev);
+        psFree (stats);
+
+        stats = psStatsAlloc (PS_STAT_FITTED_MEAN_V2 | PS_STAT_FITTED_STDEV_V2 | PS_STAT_USE_BINSIZE);
+        stats->binsize = 1.0;
+        psVectorStats (stats, y, NULL, NULL, 1);
+        ok (1, "fitted  mean v2 %f, stdev %f", stats->fittedMean,   stats->fittedStdev);
+        psFree (stats);
+
+        psFree (y);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
     return exit_status();
 }
+

branches/czw_branch/20101203/psLib/test/types/tap_psMetadataConfigWrite.c

@@ -25 +25 @@
     {
         psMemId id = psMemGetId();
-        ok( !psMetadataConfigWrite(NULL, "mdcfg.wrt"),
+        ok( !psMetadataConfigWrite(NULL, "mdcfg.wrt", NULL),
             "return false for NULL metadata input.");
         ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
@@ -35 +35 @@
         psMemId id = psMemGetId();
         psMetadata *md = psMetadataAlloc();
-        ok( !psMetadataConfigWrite(md, NULL),
+        ok( !psMetadataConfigWrite(md, NULL, NULL),
             "return false for NULL filename input.");
         psFree(md);
@@ -46 +46 @@
         psMemId id = psMemGetId();
         psMetadata *md = psMetadataAlloc();
-        ok( !psMetadataConfigWrite(md, "."),
+        ok( !psMetadataConfigWrite(md, ".", NULL),
             "return false for invalid filename input.");
         psFree(md);
@@ -57 +57 @@
         psMemId id = psMemGetId();
         psMetadata *md = psMetadataAlloc();
-        ok(psMetadataConfigWrite(md, "mdcfg.wrt"), "return false for empty metadata input.");
+        ok(psMetadataConfigWrite(md, "mdcfg.wrt", NULL), "return false for empty metadata input.");
         psFree(md);
         ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
@@ -68 +68 @@
         psMetadata *md = psMetadataAlloc();
         psMetadataAddBool(md, PS_LIST_TAIL, "item1-1", 0, "I am a boolean", true);
-        ok( psMetadataConfigWrite(md, "mdcfg.wrt"),
+        ok( psMetadataConfigWrite(md, "mdcfg.wrt", NULL),
             "return true for valid inputs.");
         char configTest[61];

@@ -27 +27 @@
 convolutionBench
 tap_psImageInterpolate2
+tap_psImageInterpolate3
 tap_psImageGeomManip
 tap_psImageMaskOps