Index: trunk/psModules/src/camera/pmFPAMosaic.c
===================================================================
--- trunk/psModules/src/camera/pmFPAMosaic.c	(revision 15288)
+++ trunk/psModules/src/camera/pmFPAMosaic.c	(revision 15477)
@@ -704,6 +704,6 @@
     psArray *readouts = cell->readouts; // The array of readouts
     if (readouts->n > 1) {
-        psLogMsg(__func__, PS_LOG_WARN, "Cell contains more than one readout (%ld) --- only the first will "
-                 "be mosaicked.\n", readouts->n);
+        psWarning("Cell contains more than one readout (%ld) --- only the first will be mosaicked.\n",
+                  readouts->n);
     }
     pmReadout *readout = readouts->data[0]; // The only readout we'll bother with
@@ -754,15 +754,15 @@
     int x0Target = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.X0");
     if (!mdok) {
-        psLogMsg(__func__, PS_LOG_WARN, "CELL.X0 is not set for the target cell; assuming 0.\n");
+        psWarning("CELL.X0 is not set for the target cell; assuming 0.\n");
         FIX_CONCEPT(targetCell->concepts, "CELL.X0", S32, 0);
     }
     int y0Target = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.Y0");
     if (!mdok) {
-        psLogMsg(__func__, PS_LOG_WARN, "CELL.Y0 is not set for the target cell; assuming 0.\n");
+        psWarning("CELL.Y0 is not set for the target cell; assuming 0.\n");
         FIX_CONCEPT(targetCell->concepts, "CELL.Y0", S32, 0);
     }
     int xParityTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.XPARITY");
     if (!mdok || (xParityTarget != -1 && xParityTarget != 1)) {
-        psLogMsg(__func__, PS_LOG_WARN, "CELL.XPARITY is not set for the target cell; assuming 1.\n");
+        psWarning("CELL.XPARITY is not set for the target cell; assuming 1.\n");
         FIX_CONCEPT(targetCell->concepts, "CELL.XPARITY", S32, 1);
         xParityTarget = 1;
@@ -770,5 +770,5 @@
     int yParityTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.YPARITY");
     if (!mdok || (yParityTarget != -1 && yParityTarget != 1)) {
-        psLogMsg(__func__, PS_LOG_WARN, "CELL.YPARITY is not set for the target cell; assuming 1.\n");
+        psWarning("CELL.YPARITY is not set for the target cell; assuming 1.\n");
         FIX_CONCEPT(targetCell->concepts, "CELL.YPARITY", S32, 1);
         yParityTarget = 1;
@@ -863,25 +863,25 @@
     int x0Target = psMetadataLookupS32(&mdok, targetChip->concepts, "CHIP.X0");
     if (!mdok) {
-        psLogMsg(__func__, PS_LOG_WARN, "CHIP.X0 is not set for the target chip; assuming 0.\n");
+        psWarning("CHIP.X0 is not set for the target chip; assuming 0.\n");
         FIX_CONCEPT(targetChip->concepts, "CHIP.X0", S32, 0);
     }
     int y0Target = psMetadataLookupS32(&mdok, targetChip->concepts, "CHIP.Y0");
     if (!mdok) {
-        psLogMsg(__func__, PS_LOG_WARN, "CHIP.Y0 is not set for the target chip; assuming 0.\n");
+        psWarning("CHIP.Y0 is not set for the target chip; assuming 0.\n");
         FIX_CONCEPT(targetChip->concepts, "CHIP.Y0", S32, 0);
     }
     x0Target += psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.X0");
     if (!mdok) {
-        psLogMsg(__func__, PS_LOG_WARN, "CELL.X0 is not set for the target cell; assuming 0.\n");
+        psWarning("CELL.X0 is not set for the target cell; assuming 0.\n");
         FIX_CONCEPT(targetCell->concepts, "CELL.X0", S32, 0);
     }
     y0Target += psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.Y0");
     if (!mdok) {
-        psLogMsg(__func__, PS_LOG_WARN, "CELL.Y0 is not set for the target cell; assuming 0.\n");
+        psWarning("CELL.Y0 is not set for the target cell; assuming 0.\n");
         FIX_CONCEPT(targetCell->concepts, "CELL.Y0", S32, 0);
     }
     int xParityChipTarget = psMetadataLookupS32(&mdok, targetChip->concepts, "CHIP.XPARITY");
     if (!mdok || (xParityChipTarget != -1 && xParityChipTarget != 1)) {
-        psLogMsg(__func__, PS_LOG_WARN, "CHIP.XPARITY is not set for the target chip; assuming 1.\n");
+        psWarning("CHIP.XPARITY is not set for the target chip; assuming 1.\n");
         FIX_CONCEPT(targetChip->concepts, "CHIP.XPARITY", S32, 1);
         xParityChipTarget = 1;
@@ -889,5 +889,5 @@
     int yParityChipTarget = psMetadataLookupS32(&mdok, targetChip->concepts, "CHIP.YPARITY");
     if (!mdok || (yParityChipTarget != -1 && yParityChipTarget != 1)) {
-        psLogMsg(__func__, PS_LOG_WARN, "CHIP.YPARITY is not set for the target chip; assuming 1.\n");
+        psWarning("CHIP.YPARITY is not set for the target chip; assuming 1.\n");
         FIX_CONCEPT(targetChip->concepts, "CHIP.YPARITY", S32, 1);
         yParityChipTarget = 1;
@@ -895,5 +895,5 @@
     int xParityCellTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.XPARITY");
     if (!mdok || (xParityCellTarget != -1 && xParityCellTarget != 1)) {
-        psLogMsg(__func__, PS_LOG_WARN, "CELL.XPARITY is not set for the target cell; assuming 1.\n");
+        psWarning("CELL.XPARITY is not set for the target cell; assuming 1.\n");
         FIX_CONCEPT(targetCell->concepts, "CELL.XPARITY", S32, 1);
         xParityCellTarget = 1;
@@ -901,5 +901,5 @@
     int yParityCellTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.YPARITY");
     if (!mdok || (yParityCellTarget != -1 && yParityCellTarget != 1)) {
-        psLogMsg(__func__, PS_LOG_WARN, "CELL.YPARITY is not set for the target cell; assuming 1.\n");
+        psWarning("CELL.YPARITY is not set for the target cell; assuming 1.\n");
         FIX_CONCEPT(targetCell->concepts, "CELL.YPARITY", S32, 1);
         yParityCellTarget = 1;
@@ -1334,10 +1334,10 @@
     pmHDU *sourceHDU = pmHDUGetHighest(source, firstSourceChip, firstSourceCell); // The HDU for the source
     if (!sourceHDU) {
-        psLogMsg(__func__, PS_LOG_WARN, "Unable to find HDU in source FPA; unable to copy headers.\n");
+        psWarning("Unable to find HDU in source FPA; unable to copy headers.\n");
         return false;
     }
     pmHDU *targetHDU = pmHDUGetHighest(target, targetChip, targetCell); // The HDU for the target
     if (!targetHDU) {
-        psLogMsg(__func__, PS_LOG_WARN, "Unable to find HDU in target FPA; unable to copy headers.\n");
+        psWarning("Unable to find HDU in target FPA; unable to copy headers.\n");
         return false;
     }