Index: /trunk/psModules/src/astrom/pmAstrometryUtils.c
===================================================================
--- /trunk/psModules/src/astrom/pmAstrometryUtils.c	(revision 11686)
+++ /trunk/psModules/src/astrom/pmAstrometryUtils.c	(revision 11687)
@@ -7,6 +7,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-01 21:04:10 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -134,7 +134,7 @@
 
     if (order < 1)
-        psAbort ("psastro", "invalid order");
+        psAbort("invalid order");
     if (order > 3)
-        psAbort ("psastro", "invalid order");
+        psAbort("invalid order");
 
     // all coeffs and masks initially set to 0
@@ -237,7 +237,7 @@
 
     if (order < 1)
-        psAbort ("psastro", "invalid order");
+        psAbort("invalid order");
     if (order > 3)
-        psAbort ("psastro", "invalid order");
+        psAbort("invalid order");
 
     // all coeffs and masks initially set to 0
Index: /trunk/psModules/src/astrom/pmAstrometryWCS.c
===================================================================
--- /trunk/psModules/src/astrom/pmAstrometryWCS.c	(revision 11686)
+++ /trunk/psModules/src/astrom/pmAstrometryWCS.c	(revision 11687)
@@ -7,6 +7,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-03 06:34:28 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -58,5 +58,5 @@
     // technically, we can have a plate scale here (fpa->toTPA:dx,dy != 1)
     if (!psPlaneTransformIsDiagonal (fpa->toTPA))
-        psAbort ("psastro", "invalid TPA transformation");
+        psAbort("invalid TPA transformation");
 
     pmAstromWCS *wcs = pmAstromWCSfromFPA(fpa, chip, tol);
@@ -396,7 +396,7 @@
 
         if (fpa->toTPA == NULL)
-            psAbort ("wcs", "projection defined, tangent-plane not defined");
+            psAbort("projection defined, tangent-plane not defined");
         if (fpa->fromTPA == NULL)
-            psAbort ("wcs", "projection defined, tangent-plane not defined");
+            psAbort("projection defined, tangent-plane not defined");
 
         // convert from pixels on this chip to pixels on reference chip
@@ -524,5 +524,5 @@
     // XXX not really: toTPA needs to have unity scale for distortion fitting function
     if (!psPlaneTransformIsDiagonal (fpa->toTPA))
-        psAbort ("psastro", "invalid TPA transformation");
+        psAbort("invalid TPA transformation");
 
     // XXX require chip->toFPA->x->nX == chip->toFPA->x->nY
Index: /trunk/psModules/src/camera/pmFPALevel.c
===================================================================
--- /trunk/psModules/src/camera/pmFPALevel.c	(revision 11686)
+++ /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 11686)
+++ /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 11686)
+++ /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 11686)
+++ /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 11686)
+++ /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 11686)
+++ /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 11686)
+++ /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 11686)
+++ /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 11686)
+++ /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;
Index: /trunk/psModules/src/concepts/pmConceptsStandard.c
===================================================================
--- /trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 11686)
+++ /trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 11687)
@@ -40,5 +40,5 @@
         return M_PI / 180.0;
     }
-    psAbort(__func__, "Should never ever get here.\n");
+    psAbort("Should never ever get here.\n");
     return NAN;
 }
Index: /trunk/psModules/src/config/pmConfig.c
===================================================================
--- /trunk/psModules/src/config/pmConfig.c	(revision 11686)
+++ /trunk/psModules/src/config/pmConfig.c	(revision 11687)
@@ -4,6 +4,6 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-30 00:05:16 $
+ *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1006,5 +1006,5 @@
         FILE *f = fopen (config->argv[Narg], "r");
         if (f == NULL) {
-            psAbort ("psphot", "unable to open specified list file");
+            psAbort("unable to open specified list file");
         }
         while (fgets (line, 1024, f) != NULL) {
@@ -1020,5 +1020,5 @@
             default:
                 // rigid format, no comments allowed?
-                psAbort ("pmConfig", "error parsing input list file");
+                psAbort("error parsing input list file");
                 break;
             }
Index: /trunk/psModules/src/config/pmConfigCamera.c
===================================================================
--- /trunk/psModules/src/config/pmConfigCamera.c	(revision 11686)
+++ /trunk/psModules/src/config/pmConfigCamera.c	(revision 11687)
@@ -118,5 +118,5 @@
         break;
     default:
-        psAbort(PS_FILE_LINE, "Should never get here.\n");
+        psAbort("Should never get here.\n");
     }
 
@@ -144,5 +144,5 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
@@ -199,5 +199,5 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
@@ -252,5 +252,5 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
Index: /trunk/psModules/src/config/pmConfigRecipes.c
===================================================================
--- /trunk/psModules/src/config/pmConfigRecipes.c	(revision 11686)
+++ /trunk/psModules/src/config/pmConfigRecipes.c	(revision 11687)
@@ -126,5 +126,5 @@
     if (optionsItem) {
         if (optionsItem->type != PS_DATA_METADATA) {
-            psAbort(__func__, "OPTIONS is not of type METADATA.");
+            psAbort("OPTIONS is not of type METADATA.");
         }
         options = psMemIncrRefCounter(optionsItem->data.V);
@@ -220,5 +220,5 @@
     if (recipesItem) {
         if (recipesItem->type != PS_DATA_METADATA) {
-            psAbort(__func__, "RECIPES is not of type METADATA.");
+            psAbort("RECIPES is not of type METADATA.");
         }
         recipes = psMemIncrRefCounter(recipesItem->data.V);
@@ -256,5 +256,5 @@
                 psFree(recipe);                 // Drop reference
             } else {
-                psAbort ("pmConfig.c", "error reading config file %s\n", recipeSource);
+                psAbort("error reading config file %s\n", recipeSource);
             }
         } else {
@@ -284,5 +284,5 @@
     assert(config);
     if ((sourceType != PM_RECIPE_SOURCE_SITE) && (sourceType != PM_RECIPE_SOURCE_CAMERA)) {
-        psAbort ("pmConfig", "invalid source for loadRecipes");
+        psAbort("invalid source for loadRecipes");
     }
     if (!source) {
@@ -308,5 +308,5 @@
         // type mismatch is a serious error
         if (fileItem->type != PS_DATA_STRING) {
-            psAbort ("pmConfig", "%s in %s RECIPES is not of type STR", fileItem->name, sourceName);
+            psAbort("%s in %s RECIPES is not of type STR", fileItem->name, sourceName);
         }
 
@@ -323,5 +323,5 @@
         if (currentItem) {
             if (currentItem->type != PS_DATA_METADATA) {
-                psAbort(__func__, "Item from recipes is not of type METADATA.");
+                psAbort("Item from recipes is not of type METADATA.");
             }
             current = psMemIncrRefCounter(currentItem->data.V);
@@ -364,5 +364,5 @@
         // type mismatch is a serious error
         if (item->type != PS_DATA_METADATA) {
-            psAbort ("pmConfig", "%s in config arguments RECIPES is not of type METADATA", item->name);
+            psAbort("%s in config arguments RECIPES is not of type METADATA", item->name);
         }
         // increment the ref counter to protect the data
@@ -470,5 +470,5 @@
         // type mismatch is a serious error
         if (item->type != PS_DATA_METADATA) {
-            psAbort ("pmConfig", "%s in config arguments OPTIONS is not of type METADATA", item->name);
+            psAbort("%s in config arguments OPTIONS is not of type METADATA", item->name);
         }
         // increment the ref counter to protect the data
Index: /trunk/psModules/src/detrend/pmBias.c
===================================================================
--- /trunk/psModules/src/detrend/pmBias.c	(revision 11686)
+++ /trunk/psModules/src/detrend/pmBias.c	(revision 11687)
@@ -400,5 +400,5 @@
                 break;
             default:
-                psAbort(__func__, "Should never get here!!!\n");
+                psAbort("Should never get here!!!\n");
             }
 
Index: /trunk/psModules/src/extras/psPipe.c
===================================================================
--- /trunk/psModules/src/extras/psPipe.c	(revision 11686)
+++ /trunk/psModules/src/extras/psPipe.c	(revision 11687)
@@ -177,5 +177,5 @@
                 return 0x100;
             default:
-                psAbort ("psPipeClose", "unexpected response to waitpid: %d\n", result);
+                psAbort("unexpected response to waitpid: %d\n", result);
             }
             break;
@@ -187,5 +187,5 @@
         default:
             if (result != pipe->pid) {
-                psAbort ("psPipeClose", "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pipe->pid);
+                psAbort("waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pipe->pid);
             }
             if (WIFEXITED(wait_status)) {
@@ -202,5 +202,5 @@
             }
             if (WIFSTOPPED(wait_status)) {
-                psAbort ("psPipeClose", "waitpid returns 'stopped' programming error\n");
+                psAbort("waitpid returns 'stopped' programming error\n");
             }
         }
Index: /trunk/psModules/src/imcombine/pmReadoutCombine.c
===================================================================
--- /trunk/psModules/src/imcombine/pmReadoutCombine.c	(revision 11686)
+++ /trunk/psModules/src/imcombine/pmReadoutCombine.c	(revision 11687)
@@ -212,5 +212,5 @@
             break;
         default:
-            psAbort(__func__, "Should never get here --- checked params->combine before.\n");
+            psAbort("Should never get here --- checked params->combine before.\n");
         }
         stats->options |= combineStdev;
Index: /trunk/psModules/src/objects/models/pmModel_GAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_GAUSS.c	(revision 11686)
+++ /trunk/psModules/src/objects/models/pmModel_GAUSS.c	(revision 11687)
@@ -100,5 +100,5 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for beta test", nParam);
+            psAbort("invalid parameter %d for beta test", nParam);
         }
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
@@ -131,5 +131,5 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param min test", nParam);
+            psAbort("invalid parameter %d for param min test", nParam);
         }
         if (params[nParam] < params_min) {
@@ -162,5 +162,5 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param max test", nParam);
+            psAbort("invalid parameter %d for param max test", nParam);
         }
         if (params[nParam] > params_max) {
@@ -170,7 +170,7 @@
         return true;
     default:
-        psAbort ("psModules.pmModel_GAUSS", "invalid choice for limits");
-    }
-    psAbort ("psModules.pmModel_GAUSS", "should not reach here");
+        psAbort("invalid choice for limits");
+    }
+    psAbort("should not reach here");
     return false;
 }
Index: /trunk/psModules/src/objects/models/pmModel_PGAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_PGAUSS.c	(revision 11686)
+++ /trunk/psModules/src/objects/models/pmModel_PGAUSS.c	(revision 11687)
@@ -102,5 +102,5 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for beta test", nParam);
+            psAbort("invalid parameter %d for beta test", nParam);
         }
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
@@ -133,5 +133,5 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param min test", nParam);
+            psAbort("invalid parameter %d for param min test", nParam);
         }
         if (params[nParam] < params_min) {
@@ -164,5 +164,5 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param max test", nParam);
+            psAbort("invalid parameter %d for param max test", nParam);
         }
         if (params[nParam] > params_max) {
@@ -172,7 +172,7 @@
         return true;
     default:
-        psAbort ("psModules.pmModel_GAUSS", "invalid choice for limits");
-    }
-    psAbort ("psModules.pmModel_GAUSS", "should not reach here");
+        psAbort("invalid choice for limits");
+    }
+    psAbort("should not reach here");
     return false;
 }
@@ -262,7 +262,7 @@
 
     if (isnan(radius))
-        psAbort ("psphot.model", "error in code: radius is NaN");
+        psAbort("error in code: radius is NaN");
     if (radius < 0)
-        psAbort ("psphot.model", "error in code: radius is negative");
+        psAbort("error in code: radius is negative");
 
     return (radius);
Index: /trunk/psModules/src/objects/models/pmModel_QGAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 11686)
+++ /trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 11687)
@@ -120,5 +120,5 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for beta test", nParam);
+            psAbort("invalid parameter %d for beta test", nParam);
         }
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
@@ -154,5 +154,5 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param min test", nParam);
+            psAbort("invalid parameter %d for param min test", nParam);
         }
         if (params[nParam] < params_min) {
@@ -188,5 +188,5 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param max test", nParam);
+            psAbort("invalid parameter %d for param max test", nParam);
         }
         if (params[nParam] > params_max) {
@@ -196,7 +196,7 @@
         return true;
     default:
-        psAbort ("psModules.pmModel_GAUSS", "invalid choice for limits");
-    }
-    psAbort ("psModules.pmModel_GAUSS", "should not reach here");
+        psAbort("invalid choice for limits");
+    }
+    psAbort("should not reach here");
     return false;
 }
@@ -321,5 +321,5 @@
 
     if (isnan(radius))
-        psAbort ("psphot.model", "error in code: radius is NaN");
+        psAbort("error in code: radius is NaN");
 
     return (radius);
Index: /trunk/psModules/src/objects/models/pmModel_RGAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_RGAUSS.c	(revision 11686)
+++ /trunk/psModules/src/objects/models/pmModel_RGAUSS.c	(revision 11687)
@@ -219,5 +219,5 @@
 
     if (isnan(radius))
-        psAbort ("psphot.model", "error in code: radius is NaN");
+        psAbort("error in code: radius is NaN");
 
     return (radius);
Index: /trunk/psModules/src/objects/pmPSF_IO.c
===================================================================
--- /trunk/psModules/src/objects/pmPSF_IO.c	(revision 11686)
+++ /trunk/psModules/src/objects/pmPSF_IO.c	(revision 11687)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-26 00:05:18 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -87,5 +87,5 @@
     int nPar = psMetadataLookupS32 (&status, metadata, "PSF_MODEL_NPAR");
     if (nPar != pmModelParameterCount (psf->type))
-        psAbort ("read PSF" , "mismatch model par count");
+        psAbort("mismatch model par count");
 
     // un-fitted terms, not in the Metadata, are left NULL
Index: /trunk/psModules/src/objects/pmSourceFitModel.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceFitModel.c	(revision 11686)
+++ /trunk/psModules/src/objects/pmSourceFitModel.c	(revision 11687)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-29 02:41:31 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -112,8 +112,8 @@
     pmModelFunc modelFunc = pmModelFunc_GetFunction (model->type);
     if (!modelFunc)
-        psAbort ("pmSourceFitModel", "invalid model function");
+        psAbort("invalid model function");
     pmModelLimits checkLimits = pmModelLimits_GetFunction (model->type);
     if (!checkLimits)
-        psAbort ("pmSourceFitModel", "invalid model limits function");
+        psAbort("invalid model limits function");
 
     // create the minimization constraints
@@ -146,5 +146,5 @@
         break;
     default:
-        psAbort ("pmSourceFitModel", "invalid fitting mode");
+        psAbort("invalid fitting mode");
     }
     // force the floating parameters to fall within the contraint ranges
@@ -448,5 +448,5 @@
         break;
     default:
-        psAbort ("pmSourceFitModel", "invalid fitting mode");
+        psAbort("invalid fitting mode");
     }
 
Index: /trunk/psModules/src/objects/pmSourceIO.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO.c	(revision 11686)
+++ /trunk/psModules/src/objects/pmSourceIO.c	(revision 11687)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-26 04:40:42 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -494,8 +494,8 @@
             dataname = pmFPAfileNameFromRule (file->extrule, file, view);
             if (!dataname)
-                psAbort ("pmSourceIO", "cannot determine data EXTNAME");
+                psAbort("cannot determine data EXTNAME");
         }
         if (!psFitsMoveExtName (file->fits, dataname)) {
-            psAbort ("pmSourceIO", "cannot find data extension %s in %s", dataname, file->filename);
+            psAbort("cannot find data extension %s in %s", dataname, file->filename);
         }
         sources = pmSourcesReadCMF (file->fits, hdu->header);
Index: /trunk/psModules/src/objects/pmSourceIO_CMP.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 11686)
+++ /trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 11687)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-02 19:55:15 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psModules/src/objects/pmSourcePhotometry.c
===================================================================
--- /trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 11686)
+++ /trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 11687)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-01 03:15:13 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -507,5 +507,5 @@
                 break;
             default:
-                psAbort ("models/objects", "invalid term for pmSourceWeight");
+                psAbort("invalid term for pmSourceWeight");
             }