Index: trunk/psModules/src/astrom/pmAstrometryObjects.c
===================================================================
--- trunk/psModules/src/astrom/pmAstrometryObjects.c	(revision 8624)
+++ trunk/psModules/src/astrom/pmAstrometryObjects.c	(revision 8669)
@@ -8,6 +8,6 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-07-24 23:56:26 $
+*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-29 21:39:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -177,5 +177,5 @@
     psFree(y2); \
     \
-    psLogMsg (__func__, 3, "radius match: %d pairs (radius: %f)\n", matches->n, RADIUS); \
+    psLogMsg (__func__, 3, "radius match: %ld pairs (radius: %f)\n", matches->n, RADIUS); \
     return (matches); \
 }
@@ -263,8 +263,8 @@
     // fit chip-to-FPA transformation
     psVectorClipFitPolynomial2D (map->x, stats, xMask, 0, x, wt, X, Y);
-    psLogMsg ("psModules.astrom", 3, "x resid: %f +/- %f (%d of %d)\n", stats->clippedMean, stats->clippedStdev, stats->clippedNvalues, x->n);
+    psLogMsg ("psModules.astrom", 3, "x resid: %f +/- %f (%ld of %ld)\n", stats->clippedMean, stats->clippedStdev, stats->clippedNvalues, x->n);
 
     psVectorClipFitPolynomial2D (map->y, stats, yMask, 0, y, wt, X, Y);
-    psLogMsg ("psModules.astrom", 3, "y resid: %f +/- %f (%d of %d)\n", stats->clippedMean, stats->clippedStdev, stats->clippedNvalues, y->n);
+    psLogMsg ("psModules.astrom", 3, "y resid: %f +/- %f (%ld of %ld)\n", stats->clippedMean, stats->clippedStdev, stats->clippedNvalues, y->n);
 
     psFree (x);
Index: trunk/psModules/src/camera/pmFPA.c
===================================================================
--- trunk/psModules/src/camera/pmFPA.c	(revision 8624)
+++ trunk/psModules/src/camera/pmFPA.c	(revision 8669)
@@ -12,6 +12,6 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-09 02:37:07 $
+*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-29 21:39:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38,5 +38,5 @@
     // if this readout has a parent, drop that instance
     if (readout->parent) {
-        psTrace("psModules.camera", 9, "Removing readout %lx from cell %lx...\n", (size_t)readout, (size_t)readout->parent);
+        psTrace("psModules.camera", 9, "Removing readout %zd from cell %zd...\n", (size_t)readout, (size_t)readout->parent);
         psArray *readouts = readout->parent->readouts;
         for (int i = 0; i < readouts->n; i++) {
@@ -46,5 +46,5 @@
         }
     }
-    psTrace("psModules.camera", 9, "Freeing readout %lx\n", (size_t) readout);
+    psTrace("psModules.camera", 9, "Freeing readout %zd\n", (size_t) readout);
     psFree(readout->image);
     psFree(readout->mask);
@@ -59,5 +59,5 @@
     // if this cell has a parent, drop that instance
     if (cell->parent) {
-        psTrace("psModules.camera", 9, "Removing cell %lx from chip %lx...\n", (size_t)cell, (size_t)cell->parent);
+        psTrace("psModules.camera", 9, "Removing cell %zd from chip %zd...\n", (size_t)cell, (size_t)cell->parent);
         psArray *cells = cell->parent->cells;
         for (int i = 0; i < cells->n; i++) {
@@ -67,5 +67,5 @@
         }
     }
-    psTrace("psModules.camera", 9, "Freeing cell %lx\n", (size_t)cell);
+    psTrace("psModules.camera", 9, "Freeing cell %zd\n", (size_t)cell);
     pmCellFreeReadouts(cell);
     psFree(cell->readouts);
@@ -81,5 +81,5 @@
     // if this chip has a parent, drop that instance
     if (chip->parent) {
-        psTrace("psModules.camera", 9, "Removing chip %lx from fpa %lx...\n", (size_t)chip, (size_t)chip->parent);
+        psTrace("psModules.camera", 9, "Removing chip %zd from fpa %zd...\n", (size_t)chip, (size_t)chip->parent);
         psArray *chips = chip->parent->chips;
         for (int i = 0; i < chips->n; i++) {
@@ -90,5 +90,5 @@
     }
 
-    psTrace("psModules.camera", 9, "Freeing chip %lx\n", (size_t)chip);
+    psTrace("psModules.camera", 9, "Freeing chip %zd\n", (size_t)chip);
     pmChipFreeCells(chip);
     psFree(chip->cells);
@@ -109,5 +109,5 @@
 static void FPAFree(pmFPA *fpa)
 {
-    psTrace("psModules.camera", 9, "Freeing fpa %lx\n", (size_t)fpa);
+    psTrace("psModules.camera", 9, "Freeing fpa %zd\n", (size_t)fpa);
 
     // NULL the parent pointers
@@ -149,5 +149,5 @@
         }
         tmpReadout->parent = NULL;
-        psTrace("psModules.camera", 9, "Will now free readout %lx...\n", (size_t)tmpReadout);
+        psTrace("psModules.camera", 9, "Will now free readout %zd...\n", (size_t)tmpReadout);
     }
     cell->readouts = psArrayRealloc(cell->readouts, 0);
Index: trunk/psModules/src/camera/pmFPACopy.c
===================================================================
--- trunk/psModules/src/camera/pmFPACopy.c	(revision 8624)
+++ trunk/psModules/src/camera/pmFPACopy.c	(revision 8669)
@@ -289,5 +289,5 @@
     psArray *sourceCells = source->cells; // The source cells
     if (targetCells->n != sourceCells->n) {
-        psError(PS_ERR_IO, true, "Number of source cells (%d) differs from the number of target cells (%d)\n",
+        psError(PS_ERR_IO, true, "Number of source cells (%ld) differs from the number of target cells (%ld)\n",
                 sourceCells->n, targetCells->n);
         return false;
@@ -326,5 +326,5 @@
     psArray *sourceChips = source->chips; // The source chips
     if (targetChips->n != sourceChips->n) {
-        psError(PS_ERR_IO, true, "Number of source chips (%d) differs from the number of target chips (%d)\n",
+        psError(PS_ERR_IO, true, "Number of source chips (%ld) differs from the number of target chips (%ld)\n",
                 sourceChips->n, targetChips->n);
         return false;
Index: trunk/psModules/src/camera/pmFPAMosaic.c
===================================================================
--- trunk/psModules/src/camera/pmFPAMosaic.c	(revision 8624)
+++ trunk/psModules/src/camera/pmFPAMosaic.c	(revision 8669)
@@ -586,5 +586,5 @@
         good = false;
     }
-    psTrace("psModules.camera", 5, "Cell %d: x0=%d y0=%d\n", index, x0Cell, y0Cell);
+    psTrace("psModules.camera", 5, "Cell %ld: x0=%d y0=%d\n", index, x0Cell, y0Cell);
 
     // Offset of the chip on the FPA
@@ -682,5 +682,5 @@
     masks->data[index]   = psMemIncrRefCounter(readout->mask);
 
-    psTrace("psModules.camera", 9, "Added cell (%x) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
+    psTrace("psModules.camera", 9, "Added cell (%p) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
             x0->data.S32[index], y0->data.S32[index], xBin->data.S32[index], yBin->data.S32[index],
             xFlip->data.U8[index], yFlip->data.U8[index]);
Index: trunk/psModules/src/camera/pmFPAfile.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.c	(revision 8624)
+++ trunk/psModules/src/camera/pmFPAfile.c	(revision 8669)
@@ -218,5 +218,5 @@
     }
     if (view->chip >= in->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %d", view->chip, in->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %ld", view->chip, in->chips->n);
         return false;
     }
@@ -229,5 +229,5 @@
     }
     if (view->cell >= inChip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %d",
+        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld",
                 view->cell, inChip->cells->n);
         return false;
@@ -261,5 +261,5 @@
     }
     if (view->chip >= in->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %d", view->chip, in->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %ld", view->chip, in->chips->n);
         return false;
     }
@@ -272,5 +272,5 @@
     }
     if (view->cell >= inChip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %d",
+        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld",
                 view->cell, inChip->cells->n);
         return false;
Index: trunk/psModules/src/camera/pmFPAfileDefine.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 8624)
+++ trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 8669)
@@ -243,5 +243,5 @@
             file->camera = pmConfigCameraByName(config, words->data[0]);
             if (!file->camera) {
-                psError(PS_ERR_IO, false, "camera %s not found\n", words->data[0]);
+                psError(PS_ERR_IO, false, "camera %s not found\n", (char *)words->data[0]);
                 psFree(words);
                 return NULL;
@@ -305,5 +305,5 @@
     }
     if (infiles->n < 1) {
-        psError(PS_ERR_IO, false, "Found n == %d files in %s in arguments\n", infiles->n, argname);
+        psError(PS_ERR_IO, false, "Found n == %ld files in %s in arguments\n", infiles->n, argname);
         return NULL;
     }
@@ -318,5 +318,5 @@
     format = pmConfigCameraFormatFromHeader (config, phu);
     if (!format) {
-        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]);
         psFree(phu);
         return NULL;
@@ -326,5 +326,5 @@
     fpa = pmFPAConstruct (config->camera);
     if (!fpa) {
-        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
         return NULL;
     }
@@ -433,5 +433,5 @@
     }
     if (infiles->n <= entry) {
-        psError(PS_ERR_IO, false, "only %d files in %s in argument, entry %d requested\n", infiles->n, argname, entry);
+        psError(PS_ERR_IO, false, "only %ld files in %s in argument, entry %d requested\n", infiles->n, argname, entry);
         return NULL;
     }
@@ -448,5 +448,5 @@
     format = pmConfigCameraFormatFromHeader (config, phu);
     if (!format) {
-        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]);
         psFree(phu);
         return NULL;
@@ -456,5 +456,5 @@
     fpa = pmFPAConstruct (config->camera);
     if (!fpa) {
-        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
         return NULL;
     }
Index: trunk/psModules/src/camera/pmFPAfileFitsIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 8624)
+++ trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 8669)
@@ -30,5 +30,5 @@
 
     if (view->chip >= fpa->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %d", view->chip, fpa->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
         return false;
     }
@@ -41,5 +41,5 @@
 
     if (view->cell >= chip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %d", view->cell, chip->cells->n);
+        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
         return false;
     }
@@ -93,5 +93,5 @@
 
     if (view->chip >= fpa->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %d", view->chip, fpa->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
         return false;
     }
@@ -104,5 +104,5 @@
 
     if (view->cell >= chip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %d", view->cell, chip->cells->n);
+        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
         return false;
     }
@@ -178,5 +178,5 @@
 
     if (view->chip >= fpa->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %d", view->chip, fpa->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
         return false;
     }
@@ -190,5 +190,5 @@
 
     if (view->cell >= chip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %d", view->cell, chip->cells->n);
+        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
         return false;
     }
Index: trunk/psModules/src/camera/pmHDUGenerate.c
===================================================================
--- trunk/psModules/src/camera/pmHDUGenerate.c	(revision 8624)
+++ trunk/psModules/src/camera/pmHDUGenerate.c	(revision 8669)
@@ -252,5 +252,5 @@
                 numReadouts = readouts->n;
             } else if (readouts->n != numReadouts) {
-                psError(PS_ERR_IO, true, "Number of readouts doesn't match: %d vs %d\n", readouts->n,
+                psError(PS_ERR_IO, true, "Number of readouts doesn't match: %ld vs %d\n", readouts->n,
                         numReadouts);
                 return false;
@@ -336,5 +336,5 @@
 
                 if (biassecs->n != readout->bias->n) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Number of bias sections (%d) and number of biases (%d)"
+                    psLogMsg(__func__, PS_LOG_WARN, "Number of bias sections (%ld) and number of biases (%ld)"
                              " do not match.\n", biassecs->n, readout->bias->n);
                 }
Index: trunk/psModules/src/camera/pmHDUUtils.c
===================================================================
--- trunk/psModules/src/camera/pmHDUUtils.c	(revision 8624)
+++ trunk/psModules/src/camera/pmHDUUtils.c	(revision 8669)
@@ -102,5 +102,5 @@
     }
 
-    psTrace("psModules.camera", level + 1, "Format: %x\n", hdu->format);
+    psTrace("psModules.camera", level + 1, "Format: %p\n", hdu->format);
     if (header) {
         if (hdu->header) {
Index: trunk/psModules/src/concepts/pmConcepts.c
===================================================================
--- trunk/psModules/src/concepts/pmConcepts.c	(revision 8624)
+++ trunk/psModules/src/concepts/pmConcepts.c	(revision 8669)
@@ -189,5 +189,5 @@
     }
 
-    psTrace("psModules.concepts", 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
+    psTrace("psModules.concepts", 3, "Writing concepts (%p %p %p): %d\n", fpa, chip, cell, source);
 
     if (source & PM_CONCEPT_SOURCE_CAMERA) {
@@ -212,5 +212,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModules.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Blanking FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
     return conceptsBlank(&conceptsFPA, fpa->concepts);
 }
@@ -225,5 +225,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModules.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Reading FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
     bool success = conceptsRead(&conceptsFPA, fpa, NULL, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
     if (propagateDown) {
@@ -248,5 +248,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModules.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Writing FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
     bool success = conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
     if (propagateDown) {
@@ -267,5 +267,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModules.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Blanking chip concepts: %p %p\n", conceptsChip, chip->concepts);
     return conceptsBlank(&conceptsChip, chip->concepts);
 }
@@ -280,5 +280,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModules.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Reading chip concepts: %p %p\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
     bool success = conceptsRead(&conceptsChip, fpa, chip, NULL, &chip->conceptsRead, source, db,
@@ -308,5 +308,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModules.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Writing chip concepts: %p %p\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
     bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
@@ -331,5 +331,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModules.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Blanking cell concepts: %p %p\n", conceptsCell, cell->concepts);
     return conceptsBlank(&conceptsCell, cell->concepts);
 }
@@ -343,5 +343,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModules.concepts", 5, "Reading cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Reading cell concepts: %p %p\n", conceptsCell, cell->concepts);
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
@@ -371,5 +371,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModules.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Writing cell concepts: %p %p\n", conceptsCell, cell->concepts);
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
@@ -704,5 +704,5 @@
     psArray *sourceChips = source->chips; // Chips in source
     if (targetChips->n != sourceChips->n) {
-        psError(PS_ERR_IO, true, "Number of chips in target (%d) and source (%d) differ --- unable to copy "
+        psError(PS_ERR_IO, true, "Number of chips in target (%ld) and source (%ld) differ --- unable to copy "
                 "concepts.\n", targetChips->n, sourceChips->n);
         return false;
@@ -720,5 +720,5 @@
         psArray *sourceCells = sourceChip->cells; // Cells in source
         if (targetCells->n != sourceCells->n) {
-            psError(PS_ERR_IO, true, "Number of cells in target (%d) and source (%d) differ for chip %d ---"
+            psError(PS_ERR_IO, true, "Number of cells in target (%ld) and source (%ld) differ for chip %d ---"
                     " unable to copy concepts.\n", targetCells->n, sourceCells->n, i);
             return false;
Index: trunk/psModules/src/concepts/pmConceptsRead.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsRead.c	(revision 8624)
+++ trunk/psModules/src/concepts/pmConceptsRead.c	(revision 8669)
@@ -156,5 +156,5 @@
                 if (!conceptParse(spec, conceptItem, cameraFormat, target, NULL, NULL, cell)) {
                     psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to parse concept %s from camera "
-                            "configuration.  It has a weird %s.SOURCE: %s\n", name, name);
+                            "configuration.\n", name);
                     status = false;
                 }
@@ -199,5 +199,5 @@
         psString name = specItem->name; // The concept name
         psMetadataItem *conceptItem = psMetadataLookup(defaults, name); // The concept, or NULL
-        psTrace("psModules.concepts", 10, "%s: %x\n", name, conceptItem);
+        psTrace("psModules.concepts", 10, "%s: %p\n", name, conceptItem);
         if (conceptItem && conceptItem->type == PS_DATA_METADATA) {
             psTrace("psModules.concepts", 5, "%s is of type METADATA.\n", name);
Index: trunk/psModules/src/concepts/pmConceptsStandard.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 8624)
+++ trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 8669)
@@ -69,5 +69,5 @@
                     sscanf(concept->data.V, "%d %d %f", &big, &medium, &small) != 3)
             {
-                psError(PS_ERR_UNKNOWN, true, "Cannot interpret FPA.RA: %s\n", concept->data.V);
+                psError(PS_ERR_UNKNOWN, true, "Cannot interpret FPA.RA: %s\n", concept->data.str);
                 break;
             }
Index: trunk/psModules/src/concepts/pmConceptsWrite.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsWrite.c	(revision 8624)
+++ trunk/psModules/src/concepts/pmConceptsWrite.c	(revision 8669)
@@ -140,5 +140,5 @@
     switch (item->type) {
     case PS_DATA_STRING:
-        psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, item->data.V);
+        psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, item->data.str);
         return psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.V);
@@ -190,5 +190,5 @@
         psList *keys = psStringSplit(keywords, " ,;", true); // List of keywords
         if (keys->n != values->n) {
-            psLogMsg(__func__, PS_LOG_WARN, "Number of keywords (%d) does not match number of values (%d).\n",
+            psLogMsg(__func__, PS_LOG_WARN, "Number of keywords (%ld) does not match number of values (%ld).\n",
                      keys->n, values->n);
         }
@@ -259,5 +259,5 @@
                         continue;
                     }
-                    psTrace("psModules.concepts", 8, "Writing %s to header %s\n", name, cameraItem->data.V);
+                    psTrace("psModules.concepts", 8, "Writing %s to header %s\n", name, cameraItem->data.str);
                     writeHeader(hdu, cameraItem->data.V, formatted);
                 } else if (strcasecmp(source, "VALUE") == 0) {
@@ -384,5 +384,5 @@
                 continue;
             }
-            psTrace("psModules.concepts", 3, "Writing %s to header %s\n", name, headerItem->data.V);
+            psTrace("psModules.concepts", 3, "Writing %s to header %s\n", name, headerItem->data.str);
             psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
             psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
Index: trunk/psModules/src/config/pmConfig.c
===================================================================
--- trunk/psModules/src/config/pmConfig.c	(revision 8624)
+++ trunk/psModules/src/config/pmConfig.c	(revision 8669)
@@ -3,6 +3,6 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 03:14:40 $
+ *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -931,5 +931,5 @@
 
             if (globList.gl_pathc == 0) {
-                psError(PS_ERR_IO, true, "No match for %s", words->data[i]);
+                psError(PS_ERR_IO, true, "No match for %s", (char *)words->data[i]);
                 return input;
             }
Index: trunk/psModules/src/detrend/pmFlatNormalize.c
===================================================================
--- trunk/psModules/src/detrend/pmFlatNormalize.c	(revision 8624)
+++ trunk/psModules/src/detrend/pmFlatNormalize.c	(revision 8669)
@@ -28,5 +28,5 @@
         if (*expFluxesPtr) {
             PS_ASSERT_VECTOR_TYPE(*expFluxesPtr, PS_TYPE_F32, false);
-            PS_ASSERT_VECTOR_SIZE(*expFluxesPtr, numExps, false);
+            PS_ASSERT_VECTOR_SIZE(*expFluxesPtr, (long)numExps, false);
         } else {
             *expFluxesPtr = psVectorAlloc(numExps, PS_TYPE_F32);
@@ -43,5 +43,5 @@
         if (*chipGainsPtr) {
             PS_ASSERT_VECTOR_TYPE(*chipGainsPtr, PS_TYPE_F32, false);
-            PS_ASSERT_VECTOR_SIZE(*chipGainsPtr, numChips, false);
+            PS_ASSERT_VECTOR_SIZE(*chipGainsPtr, (long)numChips, false);
         } else {
             *chipGainsPtr = psVectorAlloc(numChips, PS_TYPE_F32);
Index: trunk/psModules/src/detrend/pmFringeStats.c
===================================================================
--- trunk/psModules/src/detrend/pmFringeStats.c	(revision 8624)
+++ trunk/psModules/src/detrend/pmFringeStats.c	(revision 8669)
@@ -3,6 +3,6 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 IfA
@@ -115,10 +115,10 @@
     PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, false);
     PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, false);
-    PS_ASSERT_VECTOR_SIZE(x, numRows, false);
-    PS_ASSERT_VECTOR_SIZE(y, numRows, false);
+    PS_ASSERT_VECTOR_SIZE(x, (long)numRows, false);
+    PS_ASSERT_VECTOR_SIZE(y, (long)numRows, false);
     if (mask) {
         PS_ASSERT_VECTOR_NON_NULL(mask, false);
         PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, false);
-        PS_ASSERT_VECTOR_SIZE(mask, numRows, false);
+        PS_ASSERT_VECTOR_SIZE(mask, (long)numRows, false);
     }
 
@@ -356,6 +356,6 @@
     PS_ASSERT_VECTOR_TYPE(f, PS_TYPE_F32, false);
     PS_ASSERT_VECTOR_TYPE(df, PS_TYPE_F32, false);
-    PS_ASSERT_VECTOR_SIZE(f, numRows, false);
-    PS_ASSERT_VECTOR_SIZE(df, numRows, false);
+    PS_ASSERT_VECTOR_SIZE(f, (long)numRows, false);
+    PS_ASSERT_VECTOR_SIZE(df, (long)numRows, false);
 
     // We need to write:
@@ -388,5 +388,5 @@
     PS_ASSERT_INT_POSITIVE(regions->nRequested, NULL);
     PS_ASSERT_VECTORS_SIZE_EQUAL(regions->x, regions->y, NULL);
-    PS_ASSERT_VECTOR_SIZE(regions->x, regions->nRequested, NULL);
+    PS_ASSERT_VECTOR_SIZE(regions->x, (long)regions->nRequested, NULL);
 
     if (extname && strlen(extname) > 0) {
Index: trunk/psModules/src/detrend/pmNonLinear.c
===================================================================
--- trunk/psModules/src/detrend/pmNonLinear.c	(revision 8624)
+++ trunk/psModules/src/detrend/pmNonLinear.c	(revision 8669)
@@ -10,6 +10,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -80,5 +80,5 @@
         tableSize = PS_MIN(inFlux->n, outFlux->n);
         psLogMsg(__func__, PS_LOG_WARN,
-                 "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n);
+                 "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%ld, %ld)\n", inFlux->n, outFlux->n);
     }
     PS_ASSERT_VECTOR_TYPE(inFlux, PS_TYPE_F32, NULL);
Index: trunk/psModules/src/detrend/pmSubtractBias.c
===================================================================
--- trunk/psModules/src/detrend/pmSubtractBias.c	(revision 8624)
+++ trunk/psModules/src/detrend/pmSubtractBias.c	(revision 8669)
@@ -11,6 +11,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -288,5 +288,5 @@
         psStatsOptions statistic = psStatsSingleOption(overscanOpts->stat->options); // Statistic to use
         if (statistic == 0) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Multiple or no statistics options set: %x\n",
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Multiple or no statistics options set: %p\n",
                     overscanOpts->stat);
             return false;
Index: trunk/psModules/src/imcombine/pmImageCombine.c
===================================================================
--- trunk/psModules/src/imcombine/pmImageCombine.c	(revision 8624)
+++ trunk/psModules/src/imcombine/pmImageCombine.c	(revision 8669)
@@ -8,6 +8,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -50,9 +50,9 @@
     PS_ASSERT_PTR_NON_NULL(images, combine);
     psU32 numImages = images->n;
-    psTrace("psModules.imcombine", 3, "Calling pmCombineImages(%d)\n", images->n);
+    psTrace("psModules.imcombine", 3, "Calling pmCombineImages(%ld)\n", images->n);
 
     if (errors != NULL) {
         if (images->n != errors->n) {
-            psError(PS_ERR_UNKNOWN, true, "images and errors args must have same length (%d != %d)\n",
+            psError(PS_ERR_UNKNOWN, true, "images and errors args must have same length (%ld != %ld)\n",
                     images->n, errors->n);
             return(combine);
@@ -61,5 +61,5 @@
     if (masks != NULL) {
         if (images->n != masks->n) {
-            psError(PS_ERR_UNKNOWN, true, "images and masks args must have same length (%d != %d)\n",
+            psError(PS_ERR_UNKNOWN, true, "images and masks args must have same length (%ld != %ld)\n",
                     images->n, masks->n);
             return(combine);
@@ -297,5 +297,5 @@
     psFree(qpPtr);
 
-    psTrace("psModules.imcombine", 3, "Exiting pmCombineImages(%d)\n", images->n);
+    psTrace("psModules.imcombine", 3, "Exiting pmCombineImages(%ld)\n", images->n);
     return(combine);
 }
Index: trunk/psModules/src/imcombine/pmImageSubtract.c
===================================================================
--- trunk/psModules/src/imcombine/pmImageSubtract.c	(revision 8624)
+++ trunk/psModules/src/imcombine/pmImageSubtract.c	(revision 8669)
@@ -7,6 +7,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -191,5 +191,5 @@
     PS_ASSERT_VECTOR_NON_NULL(orders, NULL);
     psTrace("psModules.imcombine", 3,
-            "Calling pmSubtractionKernelsAllocISIS(%d, %d, %d, %d)\n",
+            "Calling pmSubtractionKernelsAllocISIS(%ld, %ld, %d, %d)\n",
             sigmas->n, orders->n, size, spatialOrder);
     PS_ASSERT_INT_POSITIVE(size, NULL);
@@ -307,5 +307,5 @@
 
     psTrace("psModules.imcombine", 3,
-            "Exiting pmSubtractionKernelsAllocISIS(%d, %d, %d, %d)\n",
+            "Exiting pmSubtractionKernelsAllocISIS(%ld, %ld, %d, %d)\n",
             sigmas->n, orders->n, size, spatialOrder);
     return(tmp);
@@ -679,5 +679,5 @@
     }
     psS32 nBF = kernels->u->n;
-    PS_ASSERT_VECTOR_SIZE(solution, nBF+1, NULL);
+    PS_ASSERT_VECTOR_SIZE(solution, (long)nBF+1, NULL);
 
     psS32 numCols = input->numCols;
@@ -826,5 +826,5 @@
             } else {
                 PS_ASSERT_VECTOR_TYPE(stampVector, PS_TYPE_F64, false);
-                PS_ASSERT_VECTOR_SIZE(stampVector, numSolveParams, false);
+                PS_ASSERT_VECTOR_SIZE(stampVector, (long)numSolveParams, false);
             }
             psVectorInit(stampVector, 0.0);
@@ -1038,5 +1038,5 @@
     if (solution != NULL) {
         PS_ASSERT_VECTOR_TYPE(solution, PS_TYPE_F64, NULL);
-        PS_ASSERT_VECTOR_SIZE(solution, size, NULL);
+        PS_ASSERT_VECTOR_SIZE(solution, (long)size, NULL);
     } else {
         solution = psVectorAlloc(size, PS_TYPE_F64);
@@ -1070,5 +1070,5 @@
             psVector *stampVector = stamp->vector;
             PS_ASSERT_VECTOR_TYPE(stampVector, PS_TYPE_F64, NULL);
-            PS_ASSERT_VECTOR_SIZE(stampVector, size, NULL);
+            PS_ASSERT_VECTOR_SIZE(stampVector, (long)size, NULL);
             PS_ASSERT_IMAGE_TYPE(stampMatrix, PS_TYPE_F64, NULL);
             PS_ASSERT_IMAGE_SIZE(stampMatrix, size, size, NULL);
@@ -1177,5 +1177,5 @@
     }
     psS32 nBF = kernels->u->n;
-    PS_ASSERT_VECTOR_SIZE(solution, nBF+1, NULL);
+    PS_ASSERT_VECTOR_SIZE(solution, (long)nBF+1, NULL);
 
     psS32 kernelSize = kernels->size;
@@ -1269,5 +1269,5 @@
 
     psS32 nBF = kernels->u->n;
-    PS_ASSERT_VECTOR_SIZE(solution, nBF+1, false);
+    PS_ASSERT_VECTOR_SIZE(solution, (long)nBF+1, false);
 
     psVector *deviations = CalculateDeviations(NULL,
Index: trunk/psModules/src/imcombine/pmReadoutCombine.c
===================================================================
--- trunk/psModules/src/imcombine/pmReadoutCombine.c	(revision 8624)
+++ trunk/psModules/src/imcombine/pmReadoutCombine.c	(revision 8669)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -136,5 +136,5 @@
 
         if (!readout || !readout->image) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %d is NULL or has NULL image.\n", i);
+            psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %ld is NULL or has NULL image.\n", i);
             return false;
         }
@@ -151,5 +151,5 @@
         if (readout->weight) {
             if (valid && !haveWeights) {
-                psLogMsg(__func__, PS_LOG_WARN, "Readout %d has a weight map, but others don't --- "
+                psLogMsg(__func__, PS_LOG_WARN, "Readout %ld has a weight map, but others don't --- "
                          "weights ignored.\n", i);
             } else {
@@ -157,5 +157,5 @@
             }
         } else if (haveWeights) {
-            psLogMsg(__func__, PS_LOG_WARN, "Readout %d doesn't have a weight map, but others do --- "
+            psLogMsg(__func__, PS_LOG_WARN, "Readout %ld doesn't have a weight map, but others do --- "
                      "weights ignored.\n", i);
             haveWeights = false;
@@ -168,5 +168,5 @@
         minInputCols = PS_MIN(minInputCols, readout->col0);
         maxInputCols = PS_MAX(maxInputCols, readout->col0 + readout->image->numCols);
-        psTrace("psModules.imcombine", 7, "Readout %d: offset %d,%d; size %dx%d\n", i,
+        psTrace("psModules.imcombine", 7, "Readout %ld: offset %d,%d; size %dx%d\n", i,
                 readout->col0, readout->row0, readout->image->numCols, readout->image->numRows);
     }
Index: trunk/psModules/src/objects/pmPSFtry.c
===================================================================
--- trunk/psModules/src/objects/pmPSFtry.c	(revision 8624)
+++ trunk/psModules/src/objects/pmPSFtry.c	(revision 8669)
@@ -5,6 +5,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-21 14:52:02 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -128,6 +128,6 @@
         Next ++;
     }
-    psLogMsg ("psphot.psftry", 4, "fit ext:   %f sec for %d of %d sources\n", psTimerMark ("fit"), Next, sources->n);
-    psTrace ("psphot.psftry", 3, "keeping %d of %d PSF candidates (EXT)\n", Next, sources->n);
+    psLogMsg ("psphot.psftry", 4, "fit ext:   %f sec for %d of %ld sources\n", psTimerMark ("fit"), Next, sources->n);
+    psTrace ("psphot.psftry", 3, "keeping %d of %ld PSF candidates (EXT)\n", Next, sources->n);
 
     // stage 2: construct a psf (pmPSF) from this collection of model fits
@@ -184,6 +184,6 @@
     psfTry->psf->nPSFstars = Npsf;
 
-    psLogMsg ("psphot.psftry", 4, "fit psf:   %f sec for %d of %d sources\n", psTimerMark ("fit"), Npsf, sources->n);
-    psTrace ("psphot.psftry", 3, "keeping %d of %d PSF candidates (PSF)\n", Npsf, sources->n);
+    psLogMsg ("psphot.psftry", 4, "fit psf:   %f sec for %d of %ld sources\n", psTimerMark ("fit"), Npsf, sources->n);
+    psTrace ("psphot.psftry", 3, "keeping %d of %ld PSF candidates (PSF)\n", Npsf, sources->n);
 
     // measure the chi-square trend as a function of flux (PAR[1])
Index: trunk/psModules/src/objects/pmPeaks.c
===================================================================
--- trunk/psModules/src/objects/pmPeaks.c	(revision 8624)
+++ trunk/psModules/src/objects/pmPeaks.c	(revision 8669)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-18 14:13:29 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -543,5 +543,5 @@
     output->n = 0;
 
-    psTrace (".pmObjects.pmCullPeaks", 3, "list size is %d\n", peaks->n);
+    psTrace (".pmObjects.pmCullPeaks", 3, "list size is %ld\n", peaks->n);
 
     for (int i = 0; i < peaks->n; i++) {
Index: trunk/psModules/src/objects/pmSourceIO.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO.c	(revision 8624)
+++ trunk/psModules/src/objects/pmSourceIO.c	(revision 8669)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-28 19:21:00 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -70,5 +70,5 @@
 
     if (view->chip >= fpa->chips->n) {
-        psError(PS_ERR_UNKNOWN, false, "Writing chip == %d (>= chips->n == %d)", view->chip, fpa->chips->n);
+        psError(PS_ERR_UNKNOWN, false, "Writing chip == %d (>= chips->n == %ld)", view->chip, fpa->chips->n);
         return false;
     }
@@ -84,5 +84,5 @@
 
     if (view->cell >= chip->cells->n) {
-        psError(PS_ERR_UNKNOWN, false, "Writing cell == %d (>= cells->n == %d)",
+        psError(PS_ERR_UNKNOWN, false, "Writing cell == %d (>= cells->n == %ld)",
                 view->cell, chip->cells->n);
         return false;
@@ -100,5 +100,5 @@
 
     if (view->readout >= cell->readouts->n) {
-        psError(PS_ERR_UNKNOWN, false, "Writing readout == %d (>= readouts->n == %d)",
+        psError(PS_ERR_UNKNOWN, false, "Writing readout == %d (>= readouts->n == %ld)",
                 view->readout, cell->readouts->n);
         return false;