Index: trunk/psModules/src/camera/pmCellSquish.c =================================================================== --- trunk/psModules/src/camera/pmCellSquish.c (revision 12687) +++ trunk/psModules/src/camera/pmCellSquish.c (revision 12696) @@ -2,4 +2,5 @@ #include +#include "pmHDU.h" #include "pmFPA.h" #include "pmShifts.h" Index: trunk/psModules/src/camera/pmCellSquish.h =================================================================== --- trunk/psModules/src/camera/pmCellSquish.h (revision 12687) +++ trunk/psModules/src/camera/pmCellSquish.h (revision 12696) @@ -1,6 +1,4 @@ #ifndef PM_CELL_SQUISH_H #define PM_CELL_SQUISH_H - -#include "pmFPA.h" /// Squish (combine all component readouts of) a cell Index: trunk/psModules/src/camera/pmFPA.c =================================================================== --- trunk/psModules/src/camera/pmFPA.c (revision 12687) +++ trunk/psModules/src/camera/pmFPA.c (revision 12696) @@ -10,4 +10,5 @@ #include "pmHDU.h" #include "pmFPA.h" +#include "pmFPALevel.h" #include "pmConcepts.h" #include "pmMaskBadPixels.h" Index: trunk/psModules/src/camera/pmFPA.h =================================================================== --- trunk/psModules/src/camera/pmFPA.h (revision 12687) +++ trunk/psModules/src/camera/pmFPA.h (revision 12696) @@ -6,6 +6,6 @@ * @author Eugene Magnier, IfA * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-27 20:49:57 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -16,7 +16,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include -#include "pmHDU.h" #define FPA_ASTROM 1 ///< Include astrometry information in the structures? Index: trunk/psModules/src/camera/pmFPAConstruct.c =================================================================== --- trunk/psModules/src/camera/pmFPAConstruct.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAConstruct.c (revision 12696) @@ -8,13 +8,13 @@ #include +#include "pmHDU.h" #include "pmFPA.h" #include "pmFPALevel.h" #include "pmFPAFlags.h" #include "pmConcepts.h" +#include "pmFPAview.h" #include "pmFPAConstruct.h" -#include "pmFPAview.h" #include "pmFPAUtils.h" #include "pmHDUUtils.h" - #define TABLE_OF_CONTENTS "CONTENTS" // Name for camera format metadata containing the contents Index: trunk/psModules/src/camera/pmFPAConstruct.h =================================================================== --- trunk/psModules/src/camera/pmFPAConstruct.h (revision 12687) +++ trunk/psModules/src/camera/pmFPAConstruct.h (revision 12696) @@ -4,6 +4,6 @@ * @author Paul Price, IfA * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-02-15 00:51:20 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -14,8 +14,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include -#include "pmFPA.h" -#include "pmFPAview.h" /// Construct an FPA instance on the basis of a camera configuration Index: trunk/psModules/src/camera/pmFPACopy.c =================================================================== --- trunk/psModules/src/camera/pmFPACopy.c (revision 12687) +++ trunk/psModules/src/camera/pmFPACopy.c (revision 12696) @@ -6,12 +6,10 @@ #include #include - #include +#include "pmHDU.h" #include "pmFPA.h" #include "pmFPAUtils.h" -#include "pmHDU.h" #include "pmHDUUtils.h" - #include "pmFPACopy.h" Index: trunk/psModules/src/camera/pmFPAExtent.c =================================================================== --- trunk/psModules/src/camera/pmFPAExtent.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAExtent.c (revision 12696) @@ -2,4 +2,5 @@ #include +#include "pmHDU.h" #include "pmFPA.h" Index: trunk/psModules/src/camera/pmFPAFlags.c =================================================================== --- trunk/psModules/src/camera/pmFPAFlags.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAFlags.c (revision 12696) @@ -6,4 +6,5 @@ #include +#include "pmHDU.h" #include "pmFPA.h" #include "pmFPAFlags.h" Index: trunk/psModules/src/camera/pmFPAFlags.h =================================================================== --- trunk/psModules/src/camera/pmFPAFlags.h (revision 12687) +++ trunk/psModules/src/camera/pmFPAFlags.h (revision 12696) @@ -6,6 +6,6 @@ * @author Eugene Magnier, IfA * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-24 02:54:14 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -16,7 +16,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include "pmFPA.h" - // Functions to turn on/off the file_exists flags Index: trunk/psModules/src/camera/pmFPAHeader.c =================================================================== --- trunk/psModules/src/camera/pmFPAHeader.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAHeader.c (revision 12696) @@ -6,6 +6,8 @@ #include #include + +#include "pmHDU.h" #include "pmFPA.h" -#include "pmHDU.h" +#include "pmFPALevel.h" #include "pmConcepts.h" #include "pmFPAHeader.h" Index: trunk/psModules/src/camera/pmFPAMaskWeight.c =================================================================== --- trunk/psModules/src/camera/pmFPAMaskWeight.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAMaskWeight.c (revision 12696) @@ -7,6 +7,6 @@ #include +#include "pmHDU.h" #include "pmFPA.h" -#include "pmHDU.h" #include "pmHDUUtils.h" #include "pmHDUGenerate.h" Index: trunk/psModules/src/camera/pmFPAMaskWeight.h =================================================================== --- trunk/psModules/src/camera/pmFPAMaskWeight.h (revision 12687) +++ trunk/psModules/src/camera/pmFPAMaskWeight.h (revision 12696) @@ -5,6 +5,6 @@ * @author Eugene Magnier, IfA * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-24 02:54:14 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -15,6 +15,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include "pmFPA.h" /// Pixel mask values Index: trunk/psModules/src/camera/pmFPAMosaic.c =================================================================== --- trunk/psModules/src/camera/pmFPAMosaic.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAMosaic.c (revision 12696) @@ -6,7 +6,8 @@ #include #include + +#include "pmHDU.h" #include "pmFPA.h" #include "pmFPAFlags.h" -#include "pmHDU.h" #include "pmConceptsAverage.h" #include "pmHDUUtils.h" @@ -444,8 +445,8 @@ // Get the maximum extent of the mosaic image - int xMin = INT_MAX; - int xMax = - INT_MAX; - int yMin = INT_MAX; - int yMax = - INT_MAX; + int xMin = +INT_MAX; + int xMax = -INT_MAX; + int yMin = +INT_MAX; + int yMax = -INT_MAX; psElemType type = 0; int numImages = 0; // Number of images @@ -672,4 +673,6 @@ // Set the flips on the basis of the parity + // XXX if (level == CHIP) : only apply Cell parity + // XXX if (level == FPA) : apply Chip & Cell parity if (xParityCell * xParityChip == xParityTarget) { xFlip->data.U8[index] = 0; @@ -758,4 +761,5 @@ yParityCellTarget = 1; } + # if (0) int xParityChipTarget = psMetadataLookupS32(&mdok, targetCell->parent->concepts, "CHIP.XPARITY"); if (!mdok || (xParityChipTarget != -1 && xParityChipTarget != 1)) { @@ -772,4 +776,7 @@ int xParityTarget = xParityChipTarget * xParityCellTarget; int yParityTarget = yParityChipTarget * yParityCellTarget; + # endif + int xParityTarget = xParityCellTarget; + int yParityTarget = yParityCellTarget; // Binning for the mosaicked chip is the minimum binning allowed by the cells Index: trunk/psModules/src/camera/pmFPAMosaic.h =================================================================== --- trunk/psModules/src/camera/pmFPAMosaic.h (revision 12687) +++ trunk/psModules/src/camera/pmFPAMosaic.h (revision 12696) @@ -4,6 +4,6 @@ * @author Paul Price, IfA * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-28 19:17:36 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -14,6 +14,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include "pmFPA.h" /// Mosaic all cells within a chip Index: trunk/psModules/src/camera/pmFPARead.c =================================================================== --- trunk/psModules/src/camera/pmFPARead.c (revision 12687) +++ trunk/psModules/src/camera/pmFPARead.c (revision 12696) @@ -9,7 +9,8 @@ #include +#include "pmHDU.h" #include "pmFPA.h" +#include "pmFPALevel.h" #include "pmFPAFlags.h" -#include "pmHDU.h" #include "pmHDUUtils.h" #include "pmConcepts.h" Index: trunk/psModules/src/camera/pmFPARead.h =================================================================== --- trunk/psModules/src/camera/pmFPARead.h (revision 12687) +++ trunk/psModules/src/camera/pmFPARead.h (revision 12696) @@ -4,6 +4,6 @@ * @author Paul Price, IfA * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-02-15 00:34:00 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -14,7 +14,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include -#include "pmFPA.h" /// Read a readout incrementally Index: trunk/psModules/src/camera/pmFPAUtils.c =================================================================== --- trunk/psModules/src/camera/pmFPAUtils.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAUtils.c (revision 12696) @@ -5,6 +5,7 @@ #include #include +#include -#include +#include "pmHDU.h" #include "pmFPA.h" #include "pmFPAUtils.h" Index: trunk/psModules/src/camera/pmFPAUtils.h =================================================================== --- trunk/psModules/src/camera/pmFPAUtils.h (revision 12687) +++ trunk/psModules/src/camera/pmFPAUtils.h (revision 12696) @@ -4,6 +4,6 @@ * @author Paul Price, IfA * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-24 02:54:14 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -14,6 +14,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include "pmFPA.h" /// Find a chip by name; return the index Index: trunk/psModules/src/camera/pmFPAWrite.c =================================================================== --- trunk/psModules/src/camera/pmFPAWrite.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAWrite.c (revision 12696) @@ -8,6 +8,7 @@ #include +#include "pmHDU.h" #include "pmFPA.h" -#include "pmHDU.h" +#include "pmFPALevel.h" #include "pmHDUUtils.h" #include "pmHDUGenerate.h" Index: trunk/psModules/src/camera/pmFPAWrite.h =================================================================== --- trunk/psModules/src/camera/pmFPAWrite.h (revision 12687) +++ trunk/psModules/src/camera/pmFPAWrite.h (revision 12696) @@ -4,6 +4,6 @@ * @author Paul Price, IfA * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-24 02:54:14 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -14,7 +14,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include -#include "pmFPA.h" /// Write a readout incrementally Index: trunk/psModules/src/camera/pmFPA_JPEG.c =================================================================== --- trunk/psModules/src/camera/pmFPA_JPEG.c (revision 12687) +++ trunk/psModules/src/camera/pmFPA_JPEG.c (revision 12696) @@ -5,6 +5,6 @@ * @author EAM, IfA * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-02-01 03:15:13 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -24,8 +24,12 @@ #include +#include "pmConfig.h" +#include "pmDetrendDB.h" + #include "pmHDU.h" #include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" #include "pmFPAfile.h" -#include "pmFPAview.h" #include "pmFPA_JPEG.h" Index: trunk/psModules/src/camera/pmFPA_MANAPLOT.c =================================================================== --- trunk/psModules/src/camera/pmFPA_MANAPLOT.c (revision 12687) +++ trunk/psModules/src/camera/pmFPA_MANAPLOT.c (revision 12696) @@ -5,6 +5,6 @@ * @author EAM, IfA * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-26 00:05:17 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -23,4 +23,6 @@ #include #include + +#include "pmDetrendDB.h" #include "pmHDU.h" Index: trunk/psModules/src/camera/pmFPAfile.c =================================================================== --- trunk/psModules/src/camera/pmFPAfile.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAfile.c (revision 12696) @@ -8,22 +8,12 @@ #include "pmConfig.h" +#include "pmDetrendDB.h" + #include "pmHDU.h" #include "pmFPA.h" -// #include "pmFPAMaskWeight.h" -#include "pmFPAConstruct.h" +#include "pmFPALevel.h" #include "pmFPAview.h" #include "pmFPAfile.h" #include "pmFPACopy.h" -#include "pmConceptsPhotcode.h" -// #include "pmFPAWrite.h" -// #include "pmPeaks.h" -// #include "pmMoments.h" -// #include "pmModel.h" -// #include "pmSource.h" -// #include "pmSourceIO.h" -// #include "pmGrowthCurve.h" -// #include "pmPSF.h" -// #include "pmPSF_IO.h" -// #include "pmFPA_JPEG.h" static void pmFPAfileFree(pmFPAfile *file) Index: trunk/psModules/src/camera/pmFPAfile.h =================================================================== --- trunk/psModules/src/camera/pmFPAfile.h (revision 12687) +++ trunk/psModules/src/camera/pmFPAfile.h (revision 12696) @@ -4,6 +4,6 @@ * @author EAM, IfA * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-16 00:29:17 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2004-2005 Institute for Astronomy, University of Hawaii */ @@ -14,10 +14,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include "pslib.h" -#include "pmConfig.h" -#include "pmFPA.h" -#include "pmFPAview.h" -#include "pmDetrendDB.h" typedef enum { Index: trunk/psModules/src/camera/pmFPAfileDefine.c =================================================================== --- trunk/psModules/src/camera/pmFPAfileDefine.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAfileDefine.c (revision 12696) @@ -8,26 +8,13 @@ #include "pmConfig.h" -#include "pmConcepts.h" +#include "pmDetrendDB.h" + #include "pmHDU.h" #include "pmFPA.h" -#include "pmFPAMaskWeight.h" -#include "pmFPAConstruct.h" +#include "pmFPALevel.h" #include "pmFPAview.h" #include "pmFPAfile.h" #include "pmFPAfile.h" -#include "pmFPACopy.h" -#include "pmFPARead.h" -#include "pmFPAWrite.h" -#include "pmPeaks.h" -#include "pmMoments.h" -#include "pmModel.h" -#include "pmSource.h" -#include "pmSourceIO.h" -#include "pmGrowthCurve.h" -#include "pmPSF.h" -#include "pmPSF_IO.h" -#include "pmFPA_JPEG.h" -#include "pmDetrendDB.h" -#include "pmConceptsPhotcode.h" +#include "pmFPAConstruct.h" // define an input-type pmFPAfile, bind to the optional fpa if supplied Index: trunk/psModules/src/camera/pmFPAfileDefine.h =================================================================== --- trunk/psModules/src/camera/pmFPAfileDefine.h (revision 12687) +++ trunk/psModules/src/camera/pmFPAfileDefine.h (revision 12696) @@ -4,10 +4,8 @@ * @author EAM, IfA * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-24 02:54:14 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2004-2005 Institute for Astronomy, University of Hawaii */ - -#include /// @addtogroup Camera Camera Layout Index: trunk/psModules/src/camera/pmFPAfileFitsIO.c =================================================================== --- trunk/psModules/src/camera/pmFPAfileFitsIO.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAfileFitsIO.c (revision 12696) @@ -7,14 +7,17 @@ #include "pmConfig.h" +#include "pmDetrendDB.h" + #include "pmHDU.h" #include "pmFPA.h" +#include "pmFPALevel.h" #include "pmFPARead.h" #include "pmFPAWrite.h" #include "pmFPAMaskWeight.h" -#include "pmFPAConstruct.h" #include "pmFPAview.h" #include "pmFPAfile.h" #include "pmFPAfileFitsIO.h" #include "pmFPACopy.h" +#include "pmFPAConstruct.h" pmFPA *pmFPAfileSuitableFPA(const pmFPAfile *file, const pmFPAview *view, const pmConfig *config) Index: trunk/psModules/src/camera/pmFPAfileIO.c =================================================================== --- trunk/psModules/src/camera/pmFPAfileIO.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAfileIO.c (revision 12696) @@ -8,8 +8,10 @@ #include "pmConfig.h" +#include "pmDetrendDB.h" + #include "pmHDU.h" #include "pmFPA.h" +#include "pmFPALevel.h" #include "pmFPAMaskWeight.h" -#include "pmFPAConstruct.h" #include "pmFPAview.h" #include "pmFPAfile.h" @@ -29,5 +31,5 @@ #include "pmFPA_JPEG.h" #include "pmSourcePlots.h" -#include "pmDetrendDB.h" +#include "pmFPAConstruct.h" // attempt create, read, write, close, or free pmFPAfiles available in files files are Index: trunk/psModules/src/camera/pmFPAview.c =================================================================== --- trunk/psModules/src/camera/pmFPAview.c (revision 12687) +++ trunk/psModules/src/camera/pmFPAview.c (revision 12696) @@ -3,6 +3,6 @@ * @author EAM, IfA * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-24 17:53:55 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -17,8 +17,9 @@ #include #include -#include "pslib.h" +#include #include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" #include "pmHDUUtils.h" -#include "pmFPA.h" #include "pmFPAview.h" Index: trunk/psModules/src/camera/pmFPAview.h =================================================================== --- trunk/psModules/src/camera/pmFPAview.h (revision 12687) +++ trunk/psModules/src/camera/pmFPAview.h (revision 12696) @@ -4,6 +4,6 @@ * @author Eugene Magnier, IfA * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-24 17:53:55 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -15,6 +15,6 @@ /// @{ -#include "pmFPA.h" -#include "pmFPALevel.h" +// #include "pmFPA.h" +// #include "pmFPALevel.h" /// Identifier for FPA components Index: trunk/psModules/src/camera/pmHDU.c =================================================================== --- trunk/psModules/src/camera/pmHDU.c (revision 12687) +++ trunk/psModules/src/camera/pmHDU.c (revision 12696) @@ -6,7 +6,8 @@ #include #include - #include + #include "pmConfig.h" +#include "pmHDU.h" #include "pmFPA.h" Index: trunk/psModules/src/camera/pmHDUGenerate.c =================================================================== --- trunk/psModules/src/camera/pmHDUGenerate.c (revision 12687) +++ trunk/psModules/src/camera/pmHDUGenerate.c (revision 12696) @@ -8,9 +8,8 @@ #include +#include "pmHDU.h" #include "pmFPA.h" #include "pmFPALevel.h" -#include "pmHDU.h" #include "pmHDUUtils.h" - #include "pmHDUGenerate.h" Index: trunk/psModules/src/camera/pmHDUGenerate.h =================================================================== --- trunk/psModules/src/camera/pmHDUGenerate.h (revision 12687) +++ trunk/psModules/src/camera/pmHDUGenerate.h (revision 12696) @@ -4,6 +4,6 @@ * @author Paul Price, IfA * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-24 02:54:14 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -14,6 +14,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include "pmFPA.h" /// Generate an HDU (with CELL.TRIMSEC, CELL.BIASSEC and pixels) for a cell with pixels Index: trunk/psModules/src/camera/pmHDUUtils.c =================================================================== --- trunk/psModules/src/camera/pmHDUUtils.c (revision 12687) +++ trunk/psModules/src/camera/pmHDUUtils.c (revision 12696) @@ -4,8 +4,9 @@ #include +#include + +#include "pmHDU.h" #include "pmFPA.h" -#include "pmHDU.h" #include "pmHDUUtils.h" - pmHDU *pmHDUFromFPA(const pmFPA *fpa) Index: trunk/psModules/src/camera/pmHDUUtils.h =================================================================== --- trunk/psModules/src/camera/pmHDUUtils.h (revision 12687) +++ trunk/psModules/src/camera/pmHDUUtils.h (revision 12696) @@ -4,6 +4,6 @@ * @author Paul Price, IfA * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-24 02:54:14 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ * Copyright 2005-2006 Institute for Astronomy, University of Hawaii */ @@ -14,7 +14,4 @@ /// @addtogroup Camera Camera Layout /// @{ - -#include "pmFPA.h" -#include "pmHDU.h" /// Get the lowest HDU in the hierarchy