Index: /trunk/psModules/test/verified/tst_pmObjects01.stderr
===================================================================
--- /trunk/psModules/test/verified/tst_pmObjects01.stderr	(revision 3623)
+++ /trunk/psModules/test/verified/tst_pmObjects01.stderr	(revision 3624)
@@ -14,9 +14,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmFindVectorPeeks (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmFindVectorPeeks (FILE:LINENO)
     Unallowable operation: psVector vector or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmFindVectorPeeks (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmFindVectorPeeks (FILE:LINENO)
     Unallowable operation: psVector vector has no elements.
-<DATE><TIME>|<HOST>|E|pmFindVectorPeeks (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmFindVectorPeeks (FILE:LINENO)
     Unallowable operation: psVector vector has incorrect type.
 
@@ -29,11 +29,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
-<DATE><TIME>|<HOST>|E|pmFindImagePeeks (pmObjects.c:<LINENO>)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmFindImagePeeks (pmObjects.c:<LINENO>)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmFindImagePeeks (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmFindImagePeeks (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmFindImagePeeks (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmFindImagePeeks (FILE:LINENO)
     Unallowable operation: psImage image has incorrect type.
 
@@ -46,5 +46,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmCullPeeks (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmCullPeeks (FILE:LINENO)
     Unallowable operation: peaks is NULL.
 
@@ -57,21 +57,21 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (pmObjects.c:<LINENO>)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Unallowable operation: psImage image has incorrect type.
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Unallowable operation: peak is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Error: (0.0 > innerRadius) (0.000000 -10.000000)
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Error: (innerRadius > outerRadius) (10.000000 5.000000)
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Sub image startRow is outside image boundaries (-19).
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Sub image endRow is outside image boundaries (120).
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Sub image startCol is outside image boundaries (-19).
-<DATE><TIME>|<HOST>|E|pmSourceLocalSky (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceLocalSky (FILE:LINENO)
     Sub image endCol is outside image boundaries (105).
 
@@ -84,19 +84,19 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (pmObjects.c:<LINENO>)
-    Unallowable operation: source is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (pmObjects.c:<LINENO>)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
+    Unallowable operation: source is NULL.
+<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
     Unallowable operation: psImage image has incorrect type.
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
     Error: (0.0 > radius) (0.000000 -10.000000)
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
     Sub image startCol is outside image boundaries (-9).
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
     Sub image endCol is outside image boundaries (110).
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
     Sub image startRow is outside image boundaries (-9).
-<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceSetPixelCircle (FILE:LINENO)
     Sub image endRow is outside image boundaries (110).
 <DATE><TIME>|<HOST>|W|pmSourceSetPixelCircle
@@ -111,7 +111,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceMoments (pmObjects.c:<LINENO>)
-    Unallowable operation: source is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceMoments (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceMoments (FILE:LINENO)
+    Unallowable operation: source is NULL.
+<DATE><TIME>|<HOST>|E|pmSourceMoments (FILE:LINENO)
     Error: (0.0 > radius) (0.000000 -10.000000)
 
@@ -124,31 +124,31 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmMinLM_Gauss2D (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Gauss2D (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_PsuedoGauss2D (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_PsuedoGauss2D (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Wauss2D (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Wauss2D (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_TwistGauss2D (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_TwistGauss2D (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Sersic (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmMinLM_Gauss2D (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_Gauss2D (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_PsuedoGauss2D (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_PsuedoGauss2D (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_Wauss2D (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_Wauss2D (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_TwistGauss2D (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_TwistGauss2D (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_Sersic (FILE:LINENO)
     This function is not implemented yet.
-<DATE><TIME>|<HOST>|E|pmMinLM_Sersic (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_Sersic (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector x or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_SersicCore (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmMinLM_Sersic (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_Sersic (FILE:LINENO)
+    Unallowable operation: psVector x or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_SersicCore (FILE:LINENO)
     This function is not implemented yet.
-<DATE><TIME>|<HOST>|E|pmMinLM_SersicCore (pmObjects.c:<LINENO>)
-    Unallowable operation: psVector params or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmMinLM_SersicCore (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmMinLM_SersicCore (FILE:LINENO)
+    Unallowable operation: psVector params or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmMinLM_SersicCore (FILE:LINENO)
     Unallowable operation: psVector x or its data is NULL.
 
@@ -161,11 +161,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceModelGuess (pmObjects.c:<LINENO>)
-    Unallowable operation: source is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceModelGuess (pmObjects.c:<LINENO>)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmModelAlloc (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceModelGuess (FILE:LINENO)
+    Unallowable operation: source is NULL.
+<DATE><TIME>|<HOST>|E|pmSourceModelGuess (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmModelAlloc (FILE:LINENO)
     Undefined psModelType
-<DATE><TIME>|<HOST>|E|pmSourceModelGuess (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceModelGuess (FILE:LINENO)
     Undefined psModelType
 <DATE><TIME>|<HOST>|W|pmSourceModelGuess
@@ -188,9 +188,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceContour (pmObjects.c:<LINENO>)
-    Unallowable operation: source is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceContour (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceContour (FILE:LINENO)
+    Unallowable operation: source is NULL.
+<DATE><TIME>|<HOST>|E|pmSourceContour (FILE:LINENO)
     Unallowable operation: image is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceContour (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceContour (FILE:LINENO)
     Could not find contour edge (NAN)
 
@@ -203,7 +203,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|p_pmSourceAddOrSubModel (pmObjects.c:<LINENO>)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|p_pmSourceAddOrSubModel (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|p_pmSourceAddOrSubModel (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|p_pmSourceAddOrSubModel (FILE:LINENO)
     Unallowable operation: src is NULL.
 
@@ -216,7 +216,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|p_pmSourceAddOrSubModel (pmObjects.c:<LINENO>)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|p_pmSourceAddOrSubModel (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|p_pmSourceAddOrSubModel (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|p_pmSourceAddOrSubModel (FILE:LINENO)
     Unallowable operation: src is NULL.
 
@@ -229,7 +229,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|pmSourceFitModel (pmObjects.c:<LINENO>)
-    Unallowable operation: psImage image or its data is NULL.
-<DATE><TIME>|<HOST>|E|pmSourceFitModel (pmObjects.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|pmSourceFitModel (FILE:LINENO)
+    Unallowable operation: psImage image or its data is NULL.
+<DATE><TIME>|<HOST>|E|pmSourceFitModel (FILE:LINENO)
     Unallowable operation: source is NULL.