Index: trunk/psModules/src/objects/pmModel.c
===================================================================
--- trunk/psModules/src/objects/pmModel.c	(revision 7589)
+++ trunk/psModules/src/objects/pmModel.c	(revision 7604)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-21 21:26:01 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
+#include <pslib.h>
 #include "pmModel.h"
 
@@ -94,8 +94,8 @@
 
 /******************************************************************************
-    pmModelEval(source, level, row): evaluates the model function at the specified coords.  
-     
+    pmModelEval(source, level, row): evaluates the model function at the specified coords.
+ 
     NOTE: The coords are in subImage source->pixel coords, not image coords.
-     
+ 
     XXX: Use static vectors for x (NO: needs to be thread safe)
 *****************************************************************************/
Index: trunk/psModules/src/objects/pmModelGroup.c
===================================================================
--- trunk/psModules/src/objects/pmModelGroup.c	(revision 7589)
+++ trunk/psModules/src/objects/pmModelGroup.c	(revision 7604)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-17 01:50:43 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,6 +16,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
-#include "psEllipse.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"
@@ -193,8 +192,8 @@
 /******************************************************************************
     pmSourceModelGuess(source, model): This function allocates a new
-    pmModel structure based on the given modelType specified in the argument list.  
-    The corresponding pmModelGuess function is returned, and used to 
-    supply the values of the params array in the pmModel structure.  
-     
+    pmModel structure based on the given modelType specified in the argument list.
+    The corresponding pmModelGuess function is returned, and used to
+    supply the values of the params array in the pmModel structure.
+ 
     XXX: Many parameters are based on the src->moments structure, which is in
     image, not subImage coords.  Therefore, the calls to the model evaluation
Index: trunk/psModules/src/objects/pmMoments.c
===================================================================
--- trunk/psModules/src/objects/pmMoments.c	(revision 7589)
+++ trunk/psModules/src/objects/pmMoments.c	(revision 7604)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13,5 +13,6 @@
  */
 
-#include "pslib.h"
+#include <stdio.h>
+#include <pslib.h>
 #include "pmMoments.h"
 
Index: trunk/psModules/src/objects/pmObjects.c
===================================================================
--- trunk/psModules/src/objects/pmObjects.c	(revision 7589)
+++ trunk/psModules/src/objects/pmObjects.c	(revision 7604)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:10:08 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
+#include <pslib.h>
 #include "pmObjects.h"
 #include "pmModelGroup.h"
Index: trunk/psModules/src/objects/pmPeaks.c
===================================================================
--- trunk/psModules/src/objects/pmPeaks.c	(revision 7589)
+++ trunk/psModules/src/objects/pmPeaks.c	(revision 7604)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-03 01:02:08 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
+#include <pslib.h>
 #include "pmPeaks.h"
 
@@ -51,5 +51,5 @@
 psVector containing the specified row of data from the psImage.
  
-XXX: Is there a better way to do this?  
+XXX: Is there a better way to do this?
 XXX EAM: does this really need to alloc a new vector???
 *****************************************************************************/
Index: trunk/psModules/src/objects/pmSource.c
===================================================================
--- trunk/psModules/src/objects/pmSource.c	(revision 7589)
+++ trunk/psModules/src/objects/pmSource.c	(revision 7604)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-10 02:57:58 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"
Index: trunk/psModules/src/objects/pmSourceFitModel.c
===================================================================
--- trunk/psModules/src/objects/pmSourceFitModel.c	(revision 7589)
+++ trunk/psModules/src/objects/pmSourceFitModel.c	(revision 7604)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-03 03:45:57 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"
@@ -320,5 +320,5 @@
 
 /*
-i:         0           1               2 
+i:         0           1               2
 n:         1  2  3  4  5  6  1  2  3  4  5  6  1  2  3  4  5  6
 i*6 + n: 0 1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18
Index: trunk/psModules/src/objects/pmSourceIO_CMF.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_CMF.c	(revision 7589)
+++ trunk/psModules/src/objects/pmSourceIO_CMF.c	(revision 7604)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-07 22:58:30 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13,6 +13,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
-#include "psEllipse.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"
Index: trunk/psModules/src/objects/pmSourceIO_CMP.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 7589)
+++ trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 7604)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-08 20:38:31 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13,7 +13,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
-#include "psLine.h"
-#include "psEllipse.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"
Index: trunk/psModules/src/objects/pmSourceIO_OBJ.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_OBJ.c	(revision 7589)
+++ trunk/psModules/src/objects/pmSourceIO_OBJ.c	(revision 7604)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13,7 +13,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
-#include "psLine.h"
-#include "psEllipse.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"
Index: trunk/psModules/src/objects/pmSourceIO_RAW.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_RAW.c	(revision 7589)
+++ trunk/psModules/src/objects/pmSourceIO_RAW.c	(revision 7604)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13,7 +13,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
-#include "psLine.h"
-#include "psEllipse.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"
Index: trunk/psModules/src/objects/pmSourceIO_SX.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_SX.c	(revision 7589)
+++ trunk/psModules/src/objects/pmSourceIO_SX.c	(revision 7604)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13,7 +13,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
-#include "psLine.h"
-#include "psEllipse.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"
Index: trunk/psModules/src/objects/pmSourcePhotometry.c
===================================================================
--- trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 7589)
+++ trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 7604)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-02 02:16:05 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13,5 +13,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"
Index: trunk/psModules/src/objects/pmSourceSky.c
===================================================================
--- trunk/psModules/src/objects/pmSourceSky.c	(revision 7589)
+++ trunk/psModules/src/objects/pmSourceSky.c	(revision 7604)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-02 02:16:05 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 03:21:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 #include <math.h>
 #include <string.h>
-#include "pslib.h"
+#include <pslib.h>
 #include "pmHDU.h"
 #include "pmFPA.h"