Index: /trunk/psModules/src/camera/pmFPA.c
===================================================================
--- /trunk/psModules/src/camera/pmFPA.c	(revision 9620)
+++ /trunk/psModules/src/camera/pmFPA.c	(revision 9621)
@@ -1,28 +1,6 @@
-/** @file  pmFPA.c
-*
-*  @brief This file defines the basic types for the FPA hierarchy
-*
-*  @ingroup AstroImage
-*
-*  @author GLG, MHPCC
-*
-* XXX: We should review the extent of the warning messages on these functions
-* when the transformations are not successful.
-*
-* XXX: Should we implement non-linear cell->chip transforms?
-*
-*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-17 00:33:56 $
-*
-*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
-*/
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-/******************************************************************************/
-/*  INCLUDE FILES                                                             */
-/******************************************************************************/
 #include <string.h>
 #include <math.h>
@@ -35,12 +13,10 @@
 #include "pmMaskBadPixels.h"
 
-/******************************************************************************
- *****************************************************************************/
-
 static void readoutFree(pmReadout *readout)
 {
     // if this readout has a parent, drop that instance
     if (readout->parent) {
-        psTrace("psModules.camera", 9, "Removing readout %zd from cell %zd...\n", (size_t)readout, (size_t)readout->parent);
+        psTrace("psModules.camera", 9, "Removing readout %zd from cell %zd...\n",
+                (size_t)readout, (size_t)readout->parent);
         psArray *readouts = readout->parent->readouts;
         for (int i = 0; i < readouts->n; i++) {
@@ -63,5 +39,6 @@
     // if this cell has a parent, drop that instance
     if (cell->parent) {
-        psTrace("psModules.camera", 9, "Removing cell %zd from chip %zd...\n", (size_t)cell, (size_t)cell->parent);
+        psTrace("psModules.camera", 9, "Removing cell %zd from chip %zd...\n",
+                (size_t)cell, (size_t)cell->parent);
         psArray *cells = cell->parent->cells;
         for (int i = 0; i < cells->n; i++) {
@@ -85,5 +62,6 @@
     // if this chip has a parent, drop that instance
     if (chip->parent) {
-        psTrace("psModules.camera", 9, "Removing chip %zd from fpa %zd...\n", (size_t)chip, (size_t)chip->parent);
+        psTrace("psModules.camera", 9, "Removing chip %zd from fpa %zd...\n",
+                (size_t)chip, (size_t)chip->parent);
         psArray *chips = chip->parent->chips;
         for (int i = 0; i < chips->n; i++) {
Index: /trunk/psModules/src/camera/pmFPA.h
===================================================================
--- /trunk/psModules/src/camera/pmFPA.h	(revision 9620)
+++ /trunk/psModules/src/camera/pmFPA.h	(revision 9621)
@@ -9,6 +9,6 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-17 00:33:56 $
+/// @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2006-10-18 02:29:15 $
 ///
 /// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
@@ -17,8 +17,4 @@
 #ifndef PM_FPA_H
 #define PM_FPA_H
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include <pslib.h>
Index: /trunk/psModules/src/camera/pmFPAFlags.c
===================================================================
--- /trunk/psModules/src/camera/pmFPAFlags.c	(revision 9620)
+++ /trunk/psModules/src/camera/pmFPAFlags.c	(revision 9621)
@@ -1,2 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <pslib.h>
Index: /trunk/psModules/src/camera/pmFPAFlags.h
===================================================================
--- /trunk/psModules/src/camera/pmFPAFlags.h	(revision 9620)
+++ /trunk/psModules/src/camera/pmFPAFlags.h	(revision 9621)
@@ -9,6 +9,6 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-17 00:33:56 $
+/// @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2006-10-18 02:29:15 $
 ///
 /// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
@@ -17,8 +17,4 @@
 #ifndef PM_FPA_FLAGS_H
 #define PM_FPA_FLAGS_H
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include "pmFPA.h"
Index: /trunk/psModules/src/camera/pmFPALevel.c
===================================================================
--- /trunk/psModules/src/camera/pmFPALevel.c	(revision 9620)
+++ /trunk/psModules/src/camera/pmFPALevel.c	(revision 9621)
@@ -1,2 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <strings.h>
Index: /trunk/psModules/src/camera/pmFPALevel.h
===================================================================
--- /trunk/psModules/src/camera/pmFPALevel.h	(revision 9620)
+++ /trunk/psModules/src/camera/pmFPALevel.h	(revision 9621)
@@ -7,6 +7,6 @@
 /// @author Eugene Magnier, MHPCC
 ///
-/// @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-10-17 00:33:56 $
+/// @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2006-10-18 02:29:15 $
 ///
 /// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
@@ -15,9 +15,4 @@
 #ifndef PM_FPA_LEVEL_H
 #define PM_FPA_LEVEL_H
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 
 /// Specify the level of the FPA hierarchy
Index: /trunk/psModules/src/detrend/pmSubtractSky.h
===================================================================
--- /trunk/psModules/src/detrend/pmSubtractSky.h	(revision 9620)
+++ /trunk/psModules/src/detrend/pmSubtractSky.h	(revision 9621)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-01 01:56:29 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-18 02:29:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13,10 +13,6 @@
  */
 
-#if !defined(PM_SUBTRACT_SKY_H)
+#ifndef PM_SUBTRACT_SKY_H
 #define PM_SUBTRACT_SKY_H
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include<stdio.h>
Index: /trunk/psModules/src/imcombine/pmImageCombine.h
===================================================================
--- /trunk/psModules/src/imcombine/pmImageCombine.h	(revision 9620)
+++ /trunk/psModules/src/imcombine/pmImageCombine.h	(revision 9621)
@@ -8,6 +8,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-28 03:21:19 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-18 02:29:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,14 +15,10 @@
  */
 
-#if !defined(PM_IMAGE_COMBINE_H)
+#ifndef PM_IMAGE_COMBINE_H
 #define PM_IMAGE_COMBINE_H
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include<stdio.h>
-#include<math.h>
-#include "pslib.h"
+#include <stdio.h>
+#include <math.h>
+#include <pslib.h>
 
 psImage *pmCombineImages(
Index: /trunk/psModules/src/imcombine/pmImageSubtract.h
===================================================================
--- /trunk/psModules/src/imcombine/pmImageSubtract.h	(revision 9620)
+++ /trunk/psModules/src/imcombine/pmImageSubtract.h	(revision 9621)
@@ -7,6 +7,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-01 01:56:48 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-18 02:29:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -14,15 +14,10 @@
  */
 
-#if !defined(PM_IMAGE_COMBINE_H)
+#ifndef PM_IMAGE_COMBINE_H
 #define PM_IMAGE_COMBINE_H
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include<stdio.h>
-#include<math.h>
-#include "pslib.h"
-#include "psConstants.h"
+#include <stdio.h>
+#include <math.h>
+#include <pslib.h>
 
 typedef enum {
Index: /trunk/psModules/src/objects/models/pmModel_GAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_GAUSS.c	(revision 9620)
+++ /trunk/psModules/src/objects/models/pmModel_GAUSS.c	(revision 9621)
@@ -1,2 +1,5 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /******************************************************************************
Index: /trunk/psModules/src/objects/models/pmModel_PGAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_PGAUSS.c	(revision 9620)
+++ /trunk/psModules/src/objects/models/pmModel_PGAUSS.c	(revision 9621)
@@ -1,2 +1,5 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /******************************************************************************
Index: /trunk/psModules/src/objects/models/pmModel_QGAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 9620)
+++ /trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 9621)
@@ -1,2 +1,5 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /******************************************************************************
Index: /trunk/psModules/src/objects/models/pmModel_RGAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_RGAUSS.c	(revision 9620)
+++ /trunk/psModules/src/objects/models/pmModel_RGAUSS.c	(revision 9621)
@@ -1,2 +1,5 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /******************************************************************************
Index: /trunk/psModules/src/objects/models/pmModel_SGAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_SGAUSS.c	(revision 9620)
+++ /trunk/psModules/src/objects/models/pmModel_SGAUSS.c	(revision 9621)
@@ -1,2 +1,5 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 
Index: /trunk/psModules/src/objects/models/pmModel_TGAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_TGAUSS.c	(revision 9620)
+++ /trunk/psModules/src/objects/models/pmModel_TGAUSS.c	(revision 9621)
@@ -1,2 +1,5 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /******************************************************************************
@@ -11,5 +14,5 @@
     params->data.F32[5] = sqrt(2.0) / SigmaY;
     params->data.F32[6] = Sxy;
-    params->data.F32[7] = 
+    params->data.F32[7] =
 *****************************************************************************/
 
Index: /trunk/psModules/src/objects/models/pmModel_WAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_WAUSS.c	(revision 9620)
+++ /trunk/psModules/src/objects/models/pmModel_WAUSS.c	(revision 9621)
@@ -1,2 +1,5 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /******************************************************************************
Index: /trunk/psModules/src/objects/models/pmModel_ZGAUSS.c
===================================================================
--- /trunk/psModules/src/objects/models/pmModel_ZGAUSS.c	(revision 9620)
+++ /trunk/psModules/src/objects/models/pmModel_ZGAUSS.c	(revision 9621)
@@ -1,2 +1,5 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /******************************************************************************
Index: /trunk/psModules/src/objects/pmObjects.h
===================================================================
--- /trunk/psModules/src/objects/pmObjects.h	(revision 9620)
+++ /trunk/psModules/src/objects/pmObjects.h	(revision 9621)
@@ -10,6 +10,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-18 02:29:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -17,14 +17,10 @@
  */
 
-#if !defined(PM_OBJECTS_H)
+#ifndef PM_OBJECTS_H
 #define PM_OBJECTS_H
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include <stdio.h>
 #include <math.h>
-#include "pslib.h"
+#include <pslib.h>
 
 /**