Index: trunk/psModules/src/camera/pmFPALevel.c
===================================================================
--- trunk/psModules/src/camera/pmFPALevel.c	(revision 11676)
+++ trunk/psModules/src/camera/pmFPALevel.c	(revision 11687)
@@ -30,5 +30,5 @@
         return NameREADOUT;
     default:
-        psAbort(PS_FILE_LINE, "You can't get here; level = %d", level);
+        psAbort("You can't get here; level = %d", level);
     }
     return NULL;
Index: trunk/psModules/src/camera/pmFPAMosaic.c
===================================================================
--- trunk/psModules/src/camera/pmFPAMosaic.c	(revision 11676)
+++ trunk/psModules/src/camera/pmFPAMosaic.c	(revision 11687)
@@ -497,5 +497,5 @@
                 COPY_WITH_PARITY_DIFFERENCE(U8);
             default:
-                psAbort(__func__, "Should never get here.\n");
+                psAbort("Should never get here.\n");
             }
 
@@ -526,5 +526,5 @@
                 FILL_IN(U8);
             default:
-                psAbort(__func__, "Should never get here.\n");
+                psAbort("Should never get here.\n");
             }
 
Index: trunk/psModules/src/camera/pmFPARead.c
===================================================================
--- trunk/psModules/src/camera/pmFPARead.c	(revision 11676)
+++ trunk/psModules/src/camera/pmFPARead.c	(revision 11687)
@@ -138,5 +138,5 @@
         }
     } else {
-        psAbort(__func__, "Read direction can only be 1 (rows) or 2 (cols).\n");
+        psAbort("Read direction can only be 1 (rows) or 2 (cols).\n");
     }
 
@@ -204,5 +204,5 @@
         break;
     default:
-        psAbort(__func__, "Unknown read type: %x\n", type);
+        psAbort("Unknown read type: %x\n", type);
     }
 
@@ -258,5 +258,5 @@
             break;
         default:
-            psAbort(__func__, "Unknown read type: %x\n", type);
+            psAbort("Unknown read type: %x\n", type);
         }
 
Index: trunk/psModules/src/camera/pmFPAWrite.c
===================================================================
--- trunk/psModules/src/camera/pmFPAWrite.c	(revision 11676)
+++ trunk/psModules/src/camera/pmFPAWrite.c	(revision 11687)
@@ -86,5 +86,5 @@
         return &hdu->weights;
     default:
-        psAbort(__func__, "Unknown write type: %x\n", type);
+        psAbort("Unknown write type: %x\n", type);
     }
     return NULL;
@@ -105,5 +105,5 @@
         return pmHDUWriteWeight(hdu, fits);
     default:
-        psAbort(__func__, "Unknown write type: %x\n", type);
+        psAbort("Unknown write type: %x\n", type);
     }
     return false;
Index: trunk/psModules/src/camera/pmFPAfileDefine.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 11676)
+++ trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 11687)
@@ -768,5 +768,5 @@
     // a camera config is needed (as source of file rule)
     if (config->cameraName == NULL) {
-        psAbort ("pmFPAfileDefine", "camera defined but not cameraName!");
+        psAbort("camera defined but not cameraName!");
     }
 
@@ -807,8 +807,8 @@
     psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PPIMAGE");
     if (!status)
-        psAbort ("psModules", "PPIMAGE recipe not found");
+        psAbort("PPIMAGE recipe not found");
     psMetadata *detConstraints = psMetadataLookupPtr (&status, recipe, "DETREND.CONSTRAINTS");
     if (!status)
-        psAbort ("psModules", "DETREND.CONSTRAINTS not found");
+        psAbort("DETREND.CONSTRAINTS not found");
     // XXX allow this and just skip?
 
@@ -816,5 +816,5 @@
     psMetadata *constraints = psMetadataLookupPtr (&status, detConstraints, typeName);
     if (!status) {
-        psAbort ("psModules", "DETREND.CONSTRAINTS for type %s not found", typeName);
+        psAbort("DETREND.CONSTRAINTS for type %s not found", typeName);
     }
     psFree(typeName);
@@ -825,5 +825,5 @@
     while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
         if (item->type != PS_DATA_STRING) {
-            psAbort ("psModules", "invalid type for DETREND.CONSTRAINT element");
+            psAbort("invalid type for DETREND.CONSTRAINT element");
         }
         char *option  = item->name;     // item->name must correspond to a valid detselect option
@@ -833,5 +833,5 @@
             options->filter = psMetadataLookupPtr (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "failed to find filter (concept %s)", concept);
+                psAbort("failed to find filter (concept %s)", concept);
 
         }
@@ -839,10 +839,10 @@
             options->exptime = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "exptime not found (concept %s)", concept);
+                psAbort("exptime not found (concept %s)", concept);
         }
         if (!strcasecmp (option, "airmass")) {
             options->airmass = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "airmass not found (concept %s)", concept);
+                psAbort("airmass not found (concept %s)", concept);
         }
         # if (0)
@@ -850,5 +850,5 @@
                 options->dettemp = psMetadataLookupF32 (&status, input->concepts, concept);
                 if (!status)
-                    psAbort ("psModules", "dettemp not found (concept %s)", concept);
+                    psAbort("dettemp not found (concept %s)", concept);
             }
         if (!strcasecmp (option, "version")) {
@@ -856,5 +856,5 @@
             options->version = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "version not found (concept %s)", concept);
+                psAbort("version not found (concept %s)", concept);
         }
         if (!strcasecmp (option, "twilight")) {
@@ -863,5 +863,5 @@
             options->twilight = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "twilight not found (concept %s)", concept);
+                psAbort("twilight not found (concept %s)", concept);
         }
         # endif
Index: trunk/psModules/src/camera/pmFPAfileFitsIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 11676)
+++ trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 11687)
@@ -47,5 +47,5 @@
     case PM_FPA_LEVEL_NONE:
     default:
-        psAbort(PS_FILE_LINE, "Should never get here: bad phu level.\n");
+        psAbort("Should never get here: bad phu level.\n");
     }
 
@@ -87,5 +87,5 @@
     case PM_FPA_LEVEL_NONE:
     default:
-        psAbort(PS_FILE_LINE, "Should never get here: bad phu level.\n");
+        psAbort("Should never get here: bad phu level.\n");
     }
     return NULL;
@@ -280,5 +280,5 @@
     case PM_FPA_LEVEL_NONE:
     default:
-        psAbort(PS_FILE_LINE, "Should never reach here: invalid file level.");
+        psAbort("Should never reach here: invalid file level.");
     }
 
Index: trunk/psModules/src/camera/pmFPAfileIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileIO.c	(revision 11676)
+++ trunk/psModules/src/camera/pmFPAfileIO.c	(revision 11687)
@@ -75,5 +75,5 @@
             }
         default:
-            psAbort ("pmFPAfileIO", "fileLevel not correctly set");
+            psAbort("fileLevel not correctly set");
             break;
         }
@@ -126,5 +126,5 @@
             }
         default:
-            psAbort ("pmFPAfileIO", "fileLevel not correctly set");
+            psAbort("fileLevel not correctly set");
             break;
         }
@@ -800,5 +800,5 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "You can't get here");
+            psAbort("You can't get here");
         }
     }
@@ -821,5 +821,5 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "You can't get here");
+            psAbort("You can't get here");
         }
     }
Index: trunk/psModules/src/camera/pmFPAview.c
===================================================================
--- trunk/psModules/src/camera/pmFPAview.c	(revision 11676)
+++ trunk/psModules/src/camera/pmFPAview.c	(revision 11687)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-21 04:02:36 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -289,5 +289,5 @@
         hdu  = pmHDUFromCell (cell);
         if (!hdu) {
-            psAbort("psModules", "a split readout is not covered by the current paradigm");
+            psAbort("a split readout is not covered by the current paradigm");
         }
         if (hdu->blankPHU)
Index: trunk/psModules/src/camera/pmHDUGenerate.c
===================================================================
--- trunk/psModules/src/camera/pmHDUGenerate.c	(revision 11676)
+++ trunk/psModules/src/camera/pmHDUGenerate.c	(revision 11687)
@@ -119,5 +119,5 @@
         break;
     default:
-        psAbort(__func__, "Shouldn't ever get here!\n");
+        psAbort("Shouldn't ever get here!\n");
     }
 
@@ -381,9 +381,9 @@
             psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section
             if (!mdok || !trimsec) {
-                psAbort(__func__, "Shouldn't ever get here --- CELL.TRIMSEC should have been set above.\n");
+                psAbort("Shouldn't ever get here --- CELL.TRIMSEC should have been set above.\n");
             }
             psList *biassecs = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.BIASSEC"); // Bias secionts
             if (!mdok || !biassecs) {
-                psAbort(__func__, "Shouldn't ever get here --- CELL.BIASSEC should have been set above.\n");
+                psAbort("Shouldn't ever get here --- CELL.BIASSEC should have been set above.\n");
             }
             psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator
@@ -557,5 +557,5 @@
         return pmHDUGenerateForChip(cell->parent);
     default:
-        psAbort(__func__, "Shouldn't ever get here: check your camera format configuration.\n");
+        psAbort("Shouldn't ever get here: check your camera format configuration.\n");
     }
     return false;
@@ -605,5 +605,5 @@
         return pmHDUGenerateForFPA(chip->parent);
     default:
-        psAbort(__func__, "Shouldn't ever get here: check your camera format configuration.\n");
+        psAbort("Shouldn't ever get here: check your camera format configuration.\n");
     }
     return false;
@@ -647,5 +647,5 @@
         }
     default:
-        psAbort(__func__, "Shouldn't ever get here: check your camera format configuration.\n");
+        psAbort("Shouldn't ever get here: check your camera format configuration.\n");
     }
     return false;