Index: trunk/psModules/src/objects/models/pmModel_GAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_GAUSS.c	(revision 11582)
+++ 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 11582)
+++ 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 11582)
+++ 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 11582)
+++ 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 11582)
+++ 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 11582)
+++ 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 11582)
+++ 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 11582)
+++ 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 11582)
+++ 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");
             }