IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12696


Ignore:
Timestamp:
Mar 30, 2007, 11:12:56 AM (19 years ago)
Author:
magnier
Message:

big re-org to put the includes in the .c only, not .h

Location:
trunk/psModules/src
Files:
99 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/astrom/pmAstrometryDistortion.c

    r12519 r12696  
    77*  @author EAM, IfA
    88*
    9 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2007-03-21 22:00:49 $
     9*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2007-03-30 21:12:56 $
    1111*
    1212*  Copyright 2006 Institute for Astronomy, University of Hawaii
    … …  
    2121/******************************************************************************/
    2222
    23 //#include <stdio.h>
    24 //#include <string.h>
    25 //#include <math.h>
    26 //#include <unistd.h>   // for unlink
    2723#include <pslib.h>
     24
     25#include "pmHDU.h"
    2826#include "pmFPA.h"
    2927#include "pmFPAExtent.h"

  • trunk/psModules/src/astrom/pmAstrometryObjects.c

    r12482 r12696  
    88*  @author EAM, IfA
    99*
    10 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2007-03-18 22:03:36 $
     10*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2007-03-30 21:12:56 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727#include <unistd.h>   // for unlink
    2828#include <pslib.h>
     29
     30#include "pmHDU.h"
    2931#include "pmFPA.h"
    3032#include "pmAstrometryObjects.h"

  • trunk/psModules/src/astrom/pmAstrometryRegions.c

    r12518 r12696  
    44 *
    55 *  @author EAM, IfA
    6  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    7  *  @date $Date: 2007-03-21 21:59:57 $
     6 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     7 *  @date $Date: 2007-03-30 21:12:56 $
    88 *
    99 *  Copyright 2006 Institute for Astronomy, University of Hawaii
    … …  
    1515
    1616#include <pslib.h>
     17
     18#include "pmHDU.h"
    1719#include "pmFPA.h"
    1820#include "pmFPAExtent.h"

  • trunk/psModules/src/astrom/pmAstrometryUtils.c

    r11687 r12696  
    77 *  @author EAM, IfA
    88 *
    9  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2007-02-07 23:58:17 $
     9 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2007-03-30 21:12:56 $
    1111 *
    1212 *  Copyright 2006 Institute for Astronomy, University of Hawaii
    … …  
    1818
    1919#include <pslib.h>
     20
     21#include "pmHDU.h"
    2022#include "pmFPA.h"
    2123#include "pmAstrometryUtils.h"

  • trunk/psModules/src/astrom/pmAstrometryWCS.c

    r12519 r12696  
    77 *  @author EAM, IfA
    88 *
    9  *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2007-03-21 22:00:49 $
     9 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2007-03-30 21:12:56 $
    1111 *
    1212 *  Copyright 2006 Institute for Astronomy, University of Hawaii
    … …  
    1919#include <string.h>
    2020#include <pslib.h>
     21
     22#include "pmHDU.h"
    2123#include "pmFPA.h"
    2224#include "pmFPAExtent.h"

  • trunk/psModules/src/camera/pmCellSquish.c

    r12504 r12696  
    22#include <pslib.h>
    33
     4#include "pmHDU.h"
    45#include "pmFPA.h"
    56#include "pmShifts.h"

  • trunk/psModules/src/camera/pmCellSquish.h

    r12265 r12696  
    11#ifndef PM_CELL_SQUISH_H
    22#define PM_CELL_SQUISH_H
    3 
    4 #include "pmFPA.h"
    53
    64/// Squish (combine all component readouts of) a cell

  • trunk/psModules/src/camera/pmFPA.c

    r12603 r12696  
    1010#include "pmHDU.h"
    1111#include "pmFPA.h"
     12#include "pmFPALevel.h"
    1213#include "pmConcepts.h"
    1314#include "pmMaskBadPixels.h"

  • trunk/psModules/src/camera/pmFPA.h

    r12603 r12696  
    66 * @author Eugene Magnier, IfA
    77 *
    8  * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    9  * @date $Date: 2007-03-27 20:49:57 $
     8 * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     9 * @date $Date: 2007-03-30 21:12:56 $
    1010 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    1111 */
    … …  
    1616/// @addtogroup Camera Camera Layout
    1717/// @{
    18 
    19 #include <pslib.h>
    20 #include "pmHDU.h"
    2118
    2219#define FPA_ASTROM 1                    ///< Include astrometry information in the structures?

  • trunk/psModules/src/camera/pmFPAConstruct.c

    r12660 r12696  
    88#include <pslib.h>
    99
     10#include "pmHDU.h"
    1011#include "pmFPA.h"
    1112#include "pmFPALevel.h"
    1213#include "pmFPAFlags.h"
    1314#include "pmConcepts.h"
     15#include "pmFPAview.h"
    1416#include "pmFPAConstruct.h"
    15 #include "pmFPAview.h"
    1617#include "pmFPAUtils.h"
    1718#include "pmHDUUtils.h"
    18 
    1919
    2020#define TABLE_OF_CONTENTS "CONTENTS"    // Name for camera format metadata containing the contents

  • trunk/psModules/src/camera/pmFPAConstruct.h

    r11801 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-02-15 00:51:20 $
     6 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Camera Camera Layout
    1515/// @{
    16 
    17 #include <pslib.h>
    18 #include "pmFPA.h"
    19 #include "pmFPAview.h"
    2016
    2117/// Construct an FPA instance on the basis of a camera configuration

  • trunk/psModules/src/camera/pmFPACopy.c

    r12589 r12696  
    66#include <assert.h>
    77#include <string.h>
    8 
    98#include <pslib.h>
    109
     10#include "pmHDU.h"
    1111#include "pmFPA.h"
    1212#include "pmFPAUtils.h"
    13 #include "pmHDU.h"
    1413#include "pmHDUUtils.h"
    15 
    1614#include "pmFPACopy.h"
    1715

  • trunk/psModules/src/camera/pmFPAExtent.c

    r12520 r12696  
    22#include <pslib.h>
    33
     4#include "pmHDU.h"
    45#include "pmFPA.h"
    56

  • trunk/psModules/src/camera/pmFPAFlags.c

    r9621 r12696  
    66#include <pslib.h>
    77
     8#include "pmHDU.h"
    89#include "pmFPA.h"
    910#include "pmFPAFlags.h"

  • trunk/psModules/src/camera/pmFPAFlags.h

    r11253 r12696  
    66 *  @author Eugene Magnier, IfA
    77 *
    8  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2007-01-24 02:54:14 $
     8 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2007-03-30 21:12:56 $
    1010 *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    1111 */
    … …  
    1616/// @addtogroup Camera Camera Layout
    1717/// @{
    18 
    19 #include "pmFPA.h"
    20 
    2118
    2219// Functions to turn on/off the file_exists flags

  • trunk/psModules/src/camera/pmFPAHeader.c

    r9592 r12696  
    66#include <assert.h>
    77#include <pslib.h>
     8
     9#include "pmHDU.h"
    810#include "pmFPA.h"
    9 #include "pmHDU.h"
     11#include "pmFPALevel.h"
    1012#include "pmConcepts.h"
    1113#include "pmFPAHeader.h"

  • trunk/psModules/src/camera/pmFPAMaskWeight.c

    r11225 r12696  
    77
    88#include <pslib.h>
     9#include "pmHDU.h"
    910#include "pmFPA.h"
    10 #include "pmHDU.h"
    1111#include "pmHDUUtils.h"
    1212#include "pmHDUGenerate.h"

  • trunk/psModules/src/camera/pmFPAMaskWeight.h

    r11253 r12696  
    55 * @author Eugene Magnier, IfA
    66 *
    7  * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    8  * @date $Date: 2007-01-24 02:54:14 $
     7 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     8 * @date $Date: 2007-03-30 21:12:56 $
    99 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    1515/// @addtogroup Camera Camera Layout
    1616/// @{
    17 
    18 #include "pmFPA.h"
    1917
    2018/// Pixel mask values

  • trunk/psModules/src/camera/pmFPAMosaic.c

    r12654 r12696  
    66#include <assert.h>
    77#include <pslib.h>
     8
     9#include "pmHDU.h"
    810#include "pmFPA.h"
    911#include "pmFPAFlags.h"
    10 #include "pmHDU.h"
    1112#include "pmConceptsAverage.h"
    1213#include "pmHDUUtils.h"
    … …  
    444445
    445446    // Get the maximum extent of the mosaic image
    446     int xMin = INT_MAX;
    447     int xMax = - INT_MAX;
    448     int yMin = INT_MAX;
    449     int yMax = - INT_MAX;
     447    int xMin = +INT_MAX;
     448    int xMax = -INT_MAX;
     449    int yMin = +INT_MAX;
     450    int yMax = -INT_MAX;
    450451    psElemType type = 0;
    451452    int numImages = 0;                  // Number of images
    … …  
    672673
    673674    // Set the flips on the basis of the parity
     675    // XXX if (level == CHIP) : only apply Cell parity
     676    // XXX if (level == FPA) : apply Chip & Cell parity
    674677    if (xParityCell * xParityChip == xParityTarget) {
    675678        xFlip->data.U8[index] = 0;
    … …  
    758761        yParityCellTarget = 1;
    759762    }
     763    # if (0)
    760764    int xParityChipTarget = psMetadataLookupS32(&mdok, targetCell->parent->concepts, "CHIP.XPARITY");
    761765    if (!mdok || (xParityChipTarget != -1 && xParityChipTarget != 1)) {
    … …  
    772776    int xParityTarget = xParityChipTarget * xParityCellTarget;
    773777    int yParityTarget = yParityChipTarget * yParityCellTarget;
     778    # endif
     779    int xParityTarget = xParityCellTarget;
     780    int yParityTarget = yParityCellTarget;
    774781
    775782    // Binning for the mosaicked chip is the minimum binning allowed by the cells

  • trunk/psModules/src/camera/pmFPAMosaic.h

    r12629 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-03-28 19:17:36 $
     6 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Camera Camera Layout
    1515/// @{
    16 
    17 #include "pmFPA.h"
    1816
    1917/// Mosaic all cells within a chip

  • trunk/psModules/src/camera/pmFPARead.c

    r12564 r12696  
    99#include <pslib.h>
    1010
     11#include "pmHDU.h"
    1112#include "pmFPA.h"
     13#include "pmFPALevel.h"
    1214#include "pmFPAFlags.h"
    13 #include "pmHDU.h"
    1415#include "pmHDUUtils.h"
    1516#include "pmConcepts.h"

  • trunk/psModules/src/camera/pmFPARead.h

    r11793 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-02-15 00:34:00 $
     6 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Camera Camera Layout
    1515/// @{
    16 
    17 #include <pslib.h>
    18 #include "pmFPA.h"
    1916
    2017/// Read a readout incrementally

  • trunk/psModules/src/camera/pmFPAUtils.c

    r9601 r12696  
    55#include <stdio.h>
    66#include <string.h>
     7#include <pslib.h>
    78
    8 #include <pslib.h>
     9#include "pmHDU.h"
    910#include "pmFPA.h"
    1011#include "pmFPAUtils.h"

  • trunk/psModules/src/camera/pmFPAUtils.h

    r11253 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:14 $
     6 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Camera Camera Layout
    1515/// @{
    16 
    17 #include "pmFPA.h"
    1816
    1917/// Find a chip by name; return the index

  • trunk/psModules/src/camera/pmFPAWrite.c

    r11687 r12696  
    88#include <pslib.h>
    99
     10#include "pmHDU.h"
    1011#include "pmFPA.h"
    11 #include "pmHDU.h"
     12#include "pmFPALevel.h"
    1213#include "pmHDUUtils.h"
    1314#include "pmHDUGenerate.h"

  • trunk/psModules/src/camera/pmFPAWrite.h

    r11253 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:14 $
     6 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Camera Camera Layout
    1515/// @{
    16 
    17 #include <pslib.h>
    18 #include "pmFPA.h"
    1916
    2017/// Write a readout incrementally

  • trunk/psModules/src/camera/pmFPA_JPEG.c

    r11527 r12696  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-02-01 03:15:13 $
     7 *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-03-30 21:12:56 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2424#include <pslib.h>
    2525
     26#include "pmConfig.h"
     27#include "pmDetrendDB.h"
     28
    2629#include "pmHDU.h"
    2730#include "pmFPA.h"
     31#include "pmFPALevel.h"
     32#include "pmFPAview.h"
    2833#include "pmFPAfile.h"
    29 #include "pmFPAview.h"
    3034#include "pmFPA_JPEG.h"
    3135

  • trunk/psModules/src/camera/pmFPA_MANAPLOT.c

    r11292 r12696  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-01-26 00:05:17 $
     7 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-03-30 21:12:56 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2323#include <string.h>
    2424#include <pslib.h>
     25
     26#include "pmDetrendDB.h"
    2527
    2628#include "pmHDU.h"

  • trunk/psModules/src/camera/pmFPAfile.c

    r12455 r12696  
    88
    99#include "pmConfig.h"
     10#include "pmDetrendDB.h"
     11
    1012#include "pmHDU.h"
    1113#include "pmFPA.h"
    12 // #include "pmFPAMaskWeight.h"
    13 #include "pmFPAConstruct.h"
     14#include "pmFPALevel.h"
    1415#include "pmFPAview.h"
    1516#include "pmFPAfile.h"
    1617#include "pmFPACopy.h"
    17 #include "pmConceptsPhotcode.h"
    18 // #include "pmFPAWrite.h"
    19 // #include "pmPeaks.h"
    20 // #include "pmMoments.h"
    21 // #include "pmModel.h"
    22 // #include "pmSource.h"
    23 // #include "pmSourceIO.h"
    24 // #include "pmGrowthCurve.h"
    25 // #include "pmPSF.h"
    26 // #include "pmPSF_IO.h"
    27 // #include "pmFPA_JPEG.h"
    2818
    2919static void pmFPAfileFree(pmFPAfile *file)

  • trunk/psModules/src/camera/pmFPAfile.h

    r12455 r12696  
    44 * @author EAM, IfA
    55 *
    6  * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-03-16 00:29:17 $
     6 * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Camera Camera Layout
    1515/// @{
    16 
    17 #include "pslib.h"
    18 #include "pmConfig.h"
    19 #include "pmFPA.h"
    20 #include "pmFPAview.h"
    21 #include "pmDetrendDB.h"
    2216
    2317typedef enum {

  • trunk/psModules/src/camera/pmFPAfileDefine.c

    r12682 r12696  
    88
    99#include "pmConfig.h"
    10 #include "pmConcepts.h"
     10#include "pmDetrendDB.h"
     11
    1112#include "pmHDU.h"
    1213#include "pmFPA.h"
    13 #include "pmFPAMaskWeight.h"
    14 #include "pmFPAConstruct.h"
     14#include "pmFPALevel.h"
    1515#include "pmFPAview.h"
    1616#include "pmFPAfile.h"
    1717#include "pmFPAfile.h"
    18 #include "pmFPACopy.h"
    19 #include "pmFPARead.h"
    20 #include "pmFPAWrite.h"
    21 #include "pmPeaks.h"
    22 #include "pmMoments.h"
    23 #include "pmModel.h"
    24 #include "pmSource.h"
    25 #include "pmSourceIO.h"
    26 #include "pmGrowthCurve.h"
    27 #include "pmPSF.h"
    28 #include "pmPSF_IO.h"
    29 #include "pmFPA_JPEG.h"
    30 #include "pmDetrendDB.h"
    31 #include "pmConceptsPhotcode.h"
     18#include "pmFPAConstruct.h"
    3219
    3320// define an input-type pmFPAfile, bind to the optional fpa if supplied

  • trunk/psModules/src/camera/pmFPAfileDefine.h

    r11253 r12696  
    44 * @author EAM, IfA
    55 *
    6  * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:14 $
     6 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
    99 */
    10 
    11 #include <pmDetrendDB.h>
    1210
    1311/// @addtogroup Camera Camera Layout

  • trunk/psModules/src/camera/pmFPAfileFitsIO.c

    r12603 r12696  
    77
    88#include "pmConfig.h"
     9#include "pmDetrendDB.h"
     10
    911#include "pmHDU.h"
    1012#include "pmFPA.h"
     13#include "pmFPALevel.h"
    1114#include "pmFPARead.h"
    1215#include "pmFPAWrite.h"
    1316#include "pmFPAMaskWeight.h"
    14 #include "pmFPAConstruct.h"
    1517#include "pmFPAview.h"
    1618#include "pmFPAfile.h"
    1719#include "pmFPAfileFitsIO.h"
    1820#include "pmFPACopy.h"
     21#include "pmFPAConstruct.h"
    1922
    2023pmFPA *pmFPAfileSuitableFPA(const pmFPAfile *file, const pmFPAview *view, const pmConfig *config)

  • trunk/psModules/src/camera/pmFPAfileIO.c

    r12687 r12696  
    88
    99#include "pmConfig.h"
     10#include "pmDetrendDB.h"
     11
    1012#include "pmHDU.h"
    1113#include "pmFPA.h"
     14#include "pmFPALevel.h"
    1215#include "pmFPAMaskWeight.h"
    13 #include "pmFPAConstruct.h"
    1416#include "pmFPAview.h"
    1517#include "pmFPAfile.h"
    … …  
    2931#include "pmFPA_JPEG.h"
    3032#include "pmSourcePlots.h"
    31 #include "pmDetrendDB.h"
     33#include "pmFPAConstruct.h"
    3234
    3335// attempt create, read, write, close, or free pmFPAfiles available in files files are

  • trunk/psModules/src/camera/pmFPAview.c

    r12585 r12696  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2007-03-24 17:53:55 $
     5 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-03-30 21:12:56 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1717#include <math.h>
    1818#include <string.h>
    19 #include "pslib.h"
     19#include <pslib.h>
    2020#include "pmHDU.h"
     21#include "pmFPA.h"
     22#include "pmFPALevel.h"
    2123#include "pmHDUUtils.h"
    22 #include "pmFPA.h"
    2324#include "pmFPAview.h"
    2425

  • trunk/psModules/src/camera/pmFPAview.h

    r12585 r12696  
    44 * @author Eugene Magnier, IfA
    55 *
    6  * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-03-24 17:53:55 $
     6 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1515/// @{
    1616
    17 #include "pmFPA.h"
    18 #include "pmFPALevel.h"
     17// #include "pmFPA.h"
     18// #include "pmFPALevel.h"
    1919
    2020/// Identifier for FPA components

  • trunk/psModules/src/camera/pmHDU.c

    r11434 r12696  
    66#include <assert.h>
    77#include <string.h>
    8 
    98#include <pslib.h>
     9
    1010#include "pmConfig.h"
     11#include "pmHDU.h"
    1112#include "pmFPA.h"
    1213

  • trunk/psModules/src/camera/pmHDUGenerate.c

    r11687 r12696  
    88#include <pslib.h>
    99
     10#include "pmHDU.h"
    1011#include "pmFPA.h"
    1112#include "pmFPALevel.h"
    12 #include "pmHDU.h"
    1313#include "pmHDUUtils.h"
    14 
    1514#include "pmHDUGenerate.h"
    1615

  • trunk/psModules/src/camera/pmHDUGenerate.h

    r11253 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:14 $
     6 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Camera Camera Layout
    1515/// @{
    16 
    17 #include "pmFPA.h"
    1816
    1917/// Generate an HDU (with CELL.TRIMSEC, CELL.BIASSEC and pixels) for a cell with pixels

  • trunk/psModules/src/camera/pmHDUUtils.c

    r9699 r12696  
    44
    55#include <stdio.h>
     6#include <pslib.h>
     7
     8#include "pmHDU.h"
    69#include "pmFPA.h"
    7 #include "pmHDU.h"
    810#include "pmHDUUtils.h"
    9 
    1011
    1112pmHDU *pmHDUFromFPA(const pmFPA *fpa)

  • trunk/psModules/src/camera/pmHDUUtils.h

    r11253 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:14 $
     6 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Camera Camera Layout
    1515/// @{
    16 
    17 #include "pmFPA.h"
    18 #include "pmHDU.h"
    1916
    2017/// Get the lowest HDU in the hierarchy

  • trunk/psModules/src/concepts/pmConcepts.c

    r12680 r12696  
    1010#include <string.h>
    1111
     12#include "pmHDU.h"
     13#include "pmFPA.h"
     14#include "pmFPALevel.h"
    1215#include "pmHDUUtils.h"
    1316#include "pmConcepts.h"

  • trunk/psModules/src/concepts/pmConcepts.h

    r12285 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-03-07 00:10:36 $
     6 * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Concepts Data Abstraction Concepts
    1515/// @{
    16 
    17 #include <pslib.h>
    18 #include "pmFPA.h"
    19 #include "pmFPALevel.h"
    2016
    2117/// Source for concepts when reading and writing.

  • trunk/psModules/src/concepts/pmConceptsAverage.c

    r12654 r12696  
    66#include <pslib.h>
    77
     8#include "pmHDU.h"
     9#include "pmFPA.h"
     10#include "pmFPALevel.h"
    811#include "pmConcepts.h"
    9 #include "pmFPA.h"
    10 
    1112#include "pmConceptsAverage.h"
    12 
    1313
    1414// Update a metadata entry directly

  • trunk/psModules/src/concepts/pmConceptsAverage.h

    r12654 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-03-28 23:45:31 $
     6 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Concepts Data Abstraction Concepts
    1515/// @{
    16 
    17 #include <pslib.h>
    18 #include "pmFPA.h"
    1916
    2017/// Set a variety of concepts in a cell by averaging over several

  • trunk/psModules/src/concepts/pmConceptsPhotcode.c

    r11377 r12696  
    77#include <pslib.h>
    88
     9#include "pmConfig.h"
     10#include "pmDetrendDB.h"
     11
     12#include "pmHDU.h"
     13#include "pmFPA.h"
     14#include "pmFPALevel.h"
     15#include "pmFPAview.h"
     16#include "pmFPAfile.h"
    917#include "pmConceptsPhotcode.h"
    1018

  • trunk/psModules/src/concepts/pmConceptsPhotcode.h

    r11253 r12696  
    44 * @author Eugene Magnier, IfA
    55 *
    6  * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:14 $
     6 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Concepts Data Abstraction Concepts
    1515/// @{
    16 
    17 #include <pslib.h>
    18 #include "pmConfig.h"
    19 #include "pmFPAview.h"
    20 #include "pmFPAfile.h"
    2116
    2217/// Return the photcode based on the PHOTCODE.RULE in the PHASE2 recipe

  • trunk/psModules/src/concepts/pmConceptsRead.c

    r12623 r12696  
    88#include <pslib.h>
    99
     10#include "pmHDU.h"
    1011#include "pmFPA.h"
    11 #include "pmHDU.h"
     12#include "pmFPALevel.h"
    1213#include "pmHDUUtils.h"
    1314#include "pmConcepts.h"

  • trunk/psModules/src/concepts/pmConceptsRead.h

    r11253 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:14 $
     6 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1111#ifndef PM_CONCEPTS_READ_H
    1212#define PM_CONCEPTS_READ_H
    13 
    14 #include <pslib.h>
    15 #include "pmFPA.h"
    1613
    1714/// Read concepts from the camera format file's CELLS.

  • trunk/psModules/src/concepts/pmConceptsStandard.c

    r12661 r12696  
    66#include <string.h>
    77#include <assert.h>
    8 
    9 #include "pslib.h"
    10 
     8#include <pslib.h>
     9
     10#include "pmHDU.h"
    1111#include "pmFPA.h"
     12#include "pmFPALevel.h"
     13#include "pmConcepts.h"
    1214#include "pmConceptsRead.h"
    1315#include "pmConceptsWrite.h"

  • trunk/psModules/src/concepts/pmConceptsStandard.h

    r11749 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-02-12 22:22:15 $
     6 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Concepts Data Abstraction Concepts
    1515/// @{
    16 
    17 #include <pslib.h>
    18 #include "pmFPA.h"
    19 #include "pmConcepts.h"
    2016
    2117/// Parse the FPA.FILTER concept to apply a lookup table

  • trunk/psModules/src/concepts/pmConceptsUpdate.c

    r12589 r12696  
    66#include <string.h>
    77#include <assert.h>
    8 
    98#include <pslib.h>
    109
     10#include "pmHDU.h"
    1111#include "pmFPA.h"
    1212#include "pmConceptsUpdate.h"

  • trunk/psModules/src/concepts/pmConceptsUpdate.h

    r11749 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-02-12 22:22:15 $
     6 * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2007 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1111#ifndef PM_CONCEPTS_UPDATE_H
    1212#define PM_CONCEPTS_UPDATE_H
    13 
    14 #include "pmFPA.h"
    15 
    1613
    1714/// Check for concepts to update.

  • trunk/psModules/src/concepts/pmConceptsWrite.c

    r12564 r12696  
    88#include <pslib.h>
    99
     10#include "pmHDU.h"
    1011#include "pmFPA.h"
    11 #include "pmHDU.h"
     12#include "pmFPALevel.h"
    1213#include "pmHDUUtils.h"
    1314#include "pmConcepts.h"

  • trunk/psModules/src/concepts/pmConceptsWrite.h

    r11253 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:15 $
     6 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup Concepts Data Abstraction Concepts
    1515/// @{
    16 
    17 #include <pslib.h>
    18 #include "pmFPA.h"
    1916
    2017/// "Write" concepts to (actually, check against) the camera format file's CELLS.

  • trunk/psModules/src/config/pmConfig.c

    r12564 r12696  
    44 *  @author EAM (IfA)
    55 *
    6  *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
    7  *  @date $Date: 2007-03-23 03:09:53 $
     6 *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
     7 *  @date $Date: 2007-03-30 21:12:56 $
    88 *
    99 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2828#include "pmConfig.h"
    2929#include "pmErrorCodes.h"
     30#include "pmFPALevel.h"
    3031#include "pmConfigRecipes.h"
    3132#include "pmConfigCamera.h"

  • trunk/psModules/src/config/pmConfigCamera.c

    r12639 r12696  
    11#ifdef HAVE_CONFIG_H
    2 # include "config.h"
     2#include <config.h>
    33#endif
    44
    … …  
    77#include <pslib.h>
    88
     9#include "pmHDU.h"
     10#include "pmFPA.h"
    911#include "pmFPALevel.h"
    1012#include "pmConcepts.h"
    11 
    1213#include "pmConfigCamera.h"
    13 
    1414
    1515#define TABLE_OF_CONTENTS "CONTENTS"    // Name for camera format metadata containing the contents
    … …  
    1717#define CELL_TYPES "CELLS"              // Name for camera format metadata containing the cell types
    1818
    19 
    20 // Remove a concept from the list of sources.  Need to check to see if it exists first, to avoid a warning.
    21 static void removeConcept(psMetadata *source, // Source from which to remove concept
    22                           const char *concept // Concept name to remove
    23                          )
     19// local helper functions defined below
     20static void removeCellConceptsSources(psMetadata *source);
     21static void removeChipConceptsSources(psMetadata *source);
     22
     23// Generate the Chip and FPA mosaicked version of a named camera configuration
     24bool pmConfigCameraMosaickedVersions(psMetadata *site, // The site configuration
     25                                     const char *name // Name of the un-mosaicked camera
     26                                    )
    2427{
    25     assert(source);
    26     assert(concept && strlen(concept) > 0);
    27 
    28     if (psMetadataLookup(source, concept)) {
    29         psMetadataRemoveKey(source, concept);
    30     }
    31 
    32     return;
     28    PS_ASSERT_METADATA_NON_NULL(site, false);
     29    PS_ASSERT_STRING_NON_EMPTY(name, false);
     30
     31    bool mdok;                          // Status of MD lookup
     32    psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras
     33    if (!mdok || !cameras) {
     34        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n");
     35        return false;
     36    }
     37    if (!pmConfigGenerateMosaickedVersion(cameras, cameras, name, PM_FPA_LEVEL_CHIP)) {
     38        psError(PS_ERR_UNKNOWN, true, "Failed to build Chip mosaic camera description for %s\n", name);
     39        return false;
     40    }
     41    if (!pmConfigGenerateMosaickedVersion(cameras, cameras, name, PM_FPA_LEVEL_FPA)) {
     42        psError(PS_ERR_UNKNOWN, true, "Failed to build FPA mosaic camera description for %s\n", name);
     43        return false;
     44    }
     45    return true;
    3346}
    3447
    35 // Remove certain concepts from the list of sources.  These concepts are important in the mosaicking process,
    36 // and are added explicitly to the defaults (elsewhere) so that the user can't get them wrong.
    37 static void removeCellConceptsSources(psMetadata *source // Source for concepts
     48// the operation putting the new entries first is now implemented in pmConfigGenerateMosaickedVersion
     49// Generate the Chip and FPA mosaicked version of a named camera configuration
     50bool pmConfigCameraMosaickedVersionsAll(psMetadata *site)
     51{
     52    PS_ASSERT_METADATA_NON_NULL(site, false);
     53
     54    bool mdok;                          // Status of MD lookup
     55    psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras
     56    if (!mdok || !cameras) {
     57        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n");
     58        return false;
     59    }
     60
     61    psMetadataIterator *camerasIter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator
     62    psMetadataItem *camerasItem = NULL; // Item from iteration
     63    psMetadata *new = psMetadataAlloc();// New cameras to add
     64    while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) {
     65        assert(camerasItem->type == PS_DATA_METADATA); // Only metadata are allowed here!
     66        if (!pmConfigGenerateMosaickedVersion(cameras, new, camerasItem->name, PM_FPA_LEVEL_CHIP)) {
     67            psError(PS_ERR_UNKNOWN, true, "Failed to build Chip mosaic camera description for %s\n", camerasItem->name);
     68            return false;
     69        }
     70        if (!pmConfigGenerateMosaickedVersion(cameras, new, camerasItem->name, PM_FPA_LEVEL_FPA)) {
     71            psError(PS_ERR_UNKNOWN, true, "Failed to build FPA mosaic camera description for %s\n", camerasItem->name);
     72            return false;
     73        }
     74    }
     75    psFree(camerasIter);
     76
     77    // Now put the new cameras at the top of the list of cameras, so they get recognised first
     78    // Note: going from the top, and putting everything to the top as we get there, so that the last one on
     79    // goes to the top.  This preserves the original order of the cameras, putting the mosaicked versions
     80    // before the originals.
     81    camerasIter = psMetadataIteratorAlloc(new, PS_LIST_HEAD, NULL); // Iterator
     82    while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) {
     83        psMetadataAddItem(cameras, camerasItem, PS_LIST_HEAD, 0);
     84    }
     85    psFree(camerasIter);
     86    psFree(new);
     87
     88    return true;
     89}
     90
     91// Generate a mosaicked version of a camera configuration
     92bool pmConfigGenerateMosaickedVersion(psMetadata *oldCameras, // Old list of camera configurations
     93                                      psMetadata *newCameras, // New list of camera configurations
     94                                      const char *name, // Name of original camera configuration
     95                                      pmFPALevel mosaicLevel // Level to which we are mosaicking
    3896    )
    39 {
    40     if (!source) {
    41         return;
    42     }
    43 
    44     removeConcept(source, "CELL.BIASSEC");
    45     removeConcept(source, "CELL.TRIMSEC");
    46     removeConcept(source, "CELL.XPARITY");
    47     removeConcept(source, "CELL.YPARITY");
    48     removeConcept(source, "CELL.X0");
    49     removeConcept(source, "CELL.Y0");
    50 
    51     // For the sake of the defaults, include the .DEPEND
    52     removeConcept(source, "CELL.XPARITY.DEPEND");
    53     removeConcept(source, "CELL.YPARITY.DEPEND");
    54     removeConcept(source, "CELL.X0.DEPEND");
    55     removeConcept(source, "CELL.Y0.DEPEND");
    56 
    57     return;
    58 }
    59 
    60 // Remove certain concepts from the list of sources.  These concepts are important in the mosaicking process,
    61 // and are added explicitly to the defaults (elsewhere) so that the user can't get them wrong.
    62 static void removeChipConceptsSources(psMetadata *source // Source for concepts
    63     )
    64 {
    65     if (!source) {
    66         return;
    67     }
    68 
    69     removeConcept(source, "CHIP.XPARITY");
    70     removeConcept(source, "CHIP.YPARITY");
    71     removeConcept(source, "CHIP.X0");
    72     removeConcept(source, "CHIP.Y0");
    73 
    74     // For the sake of the defaults, include the .DEPEND
    75     removeConcept(source, "CHIP.XPARITY.DEPEND");
    76     removeConcept(source, "CHIP.YPARITY.DEPEND");
    77     removeConcept(source, "CHIP.X0.DEPEND");
    78     removeConcept(source, "CHIP.Y0.DEPEND");
    79 
    80     return;
    81 }
    82 
    83 // Generate a mosaicked version of a camera configuration
    84 // XXX EAM : the error states of this function need to be more carefully considered
    85 static bool mosaickedVersion(psMetadata *oldCameras, // Old list of camera configurations
    86                              psMetadata *newCameras, // New list of camera configurations
    87                              const char *name, // Name of original camera configuration
    88                              pmFPALevel mosaicLevel // Level to which we are mosaicking
    89                             )
    9097{
    9198    assert(oldCameras);
    … …  
    97104    psMetadata *camera = psMetadataLookupMetadata(NULL, oldCameras, name); // The camera configuration
    98105    if (!camera) {
    99         // XXX is this an error?
    100106        psError(PS_ERR_UNEXPECTED_NULL, false, "Can't find camera to be mosaicked in camera list.");
    101107        return false;
    … …  
    485491}
    486492
    487 // Generate the chip mosaicked version of a camera configuration
    488 bool pmConfigCameraMosaickedVersions(psMetadata *site, // The site configuration
    489                                      const char *name // Name of the un-mosaicked camera
    490                                     )
     493/*** Helper Functions ***/
     494
     495// Remove a concept from the list of sources.  Need to check to see if it exists first, to avoid a warning.
     496static void removeConcept(psMetadata *source, // Source from which to remove concept
     497                          const char *concept // Concept name to remove
     498                         )
    491499{
    492     PS_ASSERT_METADATA_NON_NULL(site, false);
    493     PS_ASSERT_STRING_NON_EMPTY(name, false);
    494 
    495     bool mdok;                          // Status of MD lookup
    496     psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras
    497     if (!mdok || !cameras) {
    498         psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n");
    499         return false;
    500     }
    501     return mosaickedVersion(cameras, cameras, name, PM_FPA_LEVEL_CHIP) &&
    502            mosaickedVersion(cameras, cameras, name, PM_FPA_LEVEL_FPA);
     500    assert(source);
     501    assert(concept && strlen(concept) > 0);
     502
     503    if (psMetadataLookup(source, concept)) {
     504        psMetadataRemoveKey(source, concept);
     505    }
     506
     507    return;
    503508}
    504509
    505 // XXX EAM : shouldn't this loop over the unmosaicked camera names, calling the above function?
    506 // the operation putting the new entries first is now implemented in mosaickedVersion
    507 bool pmConfigCameraMosaickedVersionsAll(psMetadata *site)
     510// Remove certain concepts from the list of sources.  These concepts are important in the mosaicking process,
     511// and are added explicitly to the defaults (elsewhere) so that the user can't get them wrong.
     512static void removeCellConceptsSources(psMetadata *source // Source for concepts
     513    )
    508514{
    509     PS_ASSERT_METADATA_NON_NULL(site, false);
    510 
    511     bool mdok;                          // Status of MD lookup
    512     psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras
    513     if (!mdok || !cameras) {
    514         psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n");
    515         return false;
    516     }
    517 
    518     psMetadataIterator *camerasIter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator
    519     psMetadataItem *camerasItem = NULL; // Item from iteration
    520     psMetadata *new = psMetadataAlloc();// New cameras to add
    521     while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) {
    522         assert(camerasItem->type == PS_DATA_METADATA); // Only metadata are allowed here!
    523         mosaickedVersion(cameras, new, camerasItem->name, PM_FPA_LEVEL_CHIP);
    524         mosaickedVersion(cameras, new, camerasItem->name, PM_FPA_LEVEL_FPA);
    525     }
    526     psFree(camerasIter);
    527 
    528     // Now put the new cameras at the top of the list of cameras, so they get recognised first
    529     // Note: going from the top, and putting everything to the top as we get there, so that the last one on
    530     // goes to the top.  This preserves the original order of the cameras, putting the mosaicked versions
    531     // before the originals.
    532     camerasIter = psMetadataIteratorAlloc(new, PS_LIST_HEAD, NULL); // Iterator
    533     while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) {
    534         psMetadataAddItem(cameras, camerasItem, PS_LIST_HEAD, 0);
    535     }
    536     psFree(camerasIter);
    537     psFree(new);
    538 
    539     return true;
     515    if (!source) {
     516        return;
     517    }
     518
     519    removeConcept(source, "CELL.BIASSEC");
     520    removeConcept(source, "CELL.TRIMSEC");
     521    removeConcept(source, "CELL.XPARITY");
     522    removeConcept(source, "CELL.YPARITY");
     523    removeConcept(source, "CELL.X0");
     524    removeConcept(source, "CELL.Y0");
     525
     526    // For the sake of the defaults, include the .DEPEND
     527    removeConcept(source, "CELL.XPARITY.DEPEND");
     528    removeConcept(source, "CELL.YPARITY.DEPEND");
     529    removeConcept(source, "CELL.X0.DEPEND");
     530    removeConcept(source, "CELL.Y0.DEPEND");
     531
     532    return;
    540533}
    541534
     535// Remove certain concepts from the list of sources.  These concepts are important in the mosaicking process,
     536// and are added explicitly to the defaults (elsewhere) so that the user can't get them wrong.
     537static void removeChipConceptsSources(psMetadata *source // Source for concepts
     538    )
     539{
     540    if (!source) {
     541        return;
     542    }
     543
     544    removeConcept(source, "CHIP.XPARITY");
     545    removeConcept(source, "CHIP.YPARITY");
     546    removeConcept(source, "CHIP.X0");
     547    removeConcept(source, "CHIP.Y0");
     548
     549    // For the sake of the defaults, include the .DEPEND
     550    removeConcept(source, "CHIP.XPARITY.DEPEND");
     551    removeConcept(source, "CHIP.YPARITY.DEPEND");
     552    removeConcept(source, "CHIP.X0.DEPEND");
     553    removeConcept(source, "CHIP.Y0.DEPEND");
     554
     555    return;
     556}

  • trunk/psModules/src/config/pmConfigCamera.h

    r11251 r12696  
    55 *  @author Eugene Magnier, IfA
    66 *
    7  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-01-24 01:05:41 $
     7 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-03-30 21:12:56 $
    99 *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    1616/// @{
    1717
    18 #include <pslib.h>
     18// Generate a mosaicked version of a camera configuration
     19bool pmConfigGenerateMosaickedVersion(psMetadata *oldCameras, // Old list of camera configurations
     20                                      psMetadata *newCameras, // New list of camera configurations
     21                                      const char *name, // Name of original camera configuration
     22                                      pmFPALevel mosaicLevel // Level to which we are mosaicking
     23    );
    1924
    2025/// Generate the chip mosaicked version of a particular camera configuration
    2126bool pmConfigCameraMosaickedVersions(psMetadata *site, // Site configuration
    2227                                     const char *name // Name of the un-mosaicked camera
    23                                     );
     28    );
    2429
    2530/// Generate chip- and fpa-mosaicked versions of all the camera configurations
    2631bool pmConfigCameraMosaickedVersionsAll(psMetadata *site // Site configuration
    27                                        );
     32    );
    2833
    2934/// @}

  • trunk/psModules/src/config/pmConfigCommand.c

    r11624 r12696  
    66#include <string.h>
    77#include <pslib.h>
    8 
     8#include "pmConfig.h"
    99#include "pmConfigCommand.h"
    1010

  • trunk/psModules/src/config/pmConfigCommand.h

    r11450 r12696  
    11#ifndef PM_CONFIG_COMMAND_H
    22#define PM_CONFIG_COMMAND_H
    3 
    4 #include <pslib.h>
    5 #include "pmConfig.h"
    63
    74/// Extend a command-line to include the necessary database flags
    … …  
    1714bool pmConfigTraceCommand(psString *command ///< Command to extend
    1815                         );
    19 
    20 
    2116#endif

  • trunk/psModules/src/config/pmErrorCodes.c.in

    r11272 r12696  
    55 * will be replaced by values from errorCodes.dat
    66 */
    7 #include "pslib.h"
     7#include <pslib.h>
    88#include "pmErrorCodes.h"
    99

  • trunk/psModules/src/config/pmVersion.h

    r11251 r12696  
    55 *  @author Eugene Magnier, IfA
    66 *
    7  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-01-24 01:05:41 $
     7 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-03-30 21:12:56 $
    99 *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    1515/// @addtogroup Config Configuration System
    1616/// @{
    17 
    18 #include <pslib.h>
    1917
    2018/** Get current psModules version
    … …  
    3634psString psModulesVersionLong(void);
    3735
    38 
    3936/// @}
    4037#endif

  • trunk/psModules/src/detrend/pmBias.c

    r12647 r12696  
    88#include <pslib.h>
    99
     10#include "pmHDU.h"
    1011#include "pmFPA.h"
    1112#include "pmHDUUtils.h"

  • trunk/psModules/src/detrend/pmBias.h

    r11253 r12696  
    55 * @author Paul Price, IfA
    66 *
    7  * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    8  * @date $Date: 2007-01-24 02:54:15 $
     7 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     8 * @date $Date: 2007-03-30 21:12:56 $
    99 * Copyright 2004--2006 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    1515/// @addtogroup detrend Detrend Creation and Application
    1616/// @{
    17 
    18 #include <pslib.h>
    19 
    20 #include "pmFPA.h"
    2117
    2218/// Type of fit to perform

  • trunk/psModules/src/detrend/pmDetrendDB.c

    r12364 r12696  
    66#include <string.h>
    77#include <pslib.h>
     8
    89#include "pmConfig.h"
    910#include "pmConfigCommand.h"
     11#include "pmHDU.h"
    1012#include "pmFPA.h"
    1113#include "pmFPALevel.h"

  • trunk/psModules/src/detrend/pmDetrendDB.h

    r12365 r12696  
    99 * @author EAM, IfA
    1010 *
    11  * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    12  * @date $Date: 2007-03-09 02:49:53 $
     11 * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     12 * @date $Date: 2007-03-30 21:12:56 $
    1313 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
    1414 */
    … …  
    1919/// @addtogroup detrend Detrend Creation and Application
    2020/// @{
    21 
    22 #include "pmConfig.h"
    23 #include "pmFPALevel.h"
    2421
    2522typedef enum {

  • trunk/psModules/src/detrend/pmFlatField.c

    r10330 r12696  
    66#include <pslib.h>
    77
     8#include "pmHDU.h"
    89#include "pmFPA.h"
    910#include "pmHDUUtils.h"
    1011#include "pmFPAMaskWeight.h"
    1112#include "pmFlatField.h"
    12 
    1313
    1414bool pmFlatField(pmReadout *in, const pmReadout *flat)

  • trunk/psModules/src/detrend/pmFlatField.h

    r11253 r12696  
    55 * @author Paul Price, IfA
    66 *
    7  * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    8  * @date $Date: 2007-01-24 02:54:15 $
     7 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     8 * @date $Date: 2007-03-30 21:12:56 $
    99 * Copyright 2004-2006 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    1515/// @addtogroup detrend Detrend Creation and Application
    1616/// @{
    17 
    18 #include "pmFPA.h"
    1917
    2018/// Apply flat field calibration to a readout

  • trunk/psModules/src/detrend/pmFlatNormalize.h

    r11253 r12696  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:15 $
     6 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2004-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1414/// @addtogroup detrend Detrend Creation and Application
    1515/// @{
    16 
    17 #include <pslib.h>
    1816
    1917/// Normalize flat-field measurements

  • trunk/psModules/src/detrend/pmFringeStats.c

    r11150 r12696  
    77#include <string.h>
    88#include <pslib.h>
     9
     10#include "pmHDU.h"
    911#include "pmFPA.h"
    1012#include "pmFringeStats.h"
    11 
    1213
    1314// Future optimisations for speed:

  • trunk/psModules/src/detrend/pmMaskBadPixels.c

    r10417 r12696  
    77#include <pslib.h>
    88
     9#include "pmHDU.h"
    910#include "pmFPA.h"
    1011#include "pmHDUUtils.h"

  • trunk/psModules/src/detrend/pmMaskBadPixels.h

    r11253 r12696  
    55 * @author Eugene Magnier, IfA
    66 *
    7  * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    8  * @date $Date: 2007-01-24 02:54:15 $
     7 * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     8 * @date $Date: 2007-03-30 21:12:56 $
    99 * Copyright 2004 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    1515/// @addtogroup detrend Detrend Creation and Application
    1616/// @{
    17 
    18 #include <pslib.h>
    19 #include "pmFPA.h"
    2017
    2118/// Applies the bad pixel mask to the input

  • trunk/psModules/src/detrend/pmNonLinear.c

    r12456 r12696  
    66#include <pslib.h>
    77
     8#include "pmHDU.h"
    89#include "pmFPA.h"
    910#include "pmNonLinear.h"

  • trunk/psModules/src/detrend/pmNonLinear.h

    r11253 r12696  
    55 * @author Paul Price, IfA
    66 *
    7  * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    8  * @date $Date: 2007-01-24 02:54:15 $
     7 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     8 * @date $Date: 2007-03-30 21:12:56 $
    99 * Copyright 2004 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    1515/// @addtogroup detrend Detrend Creation and Application
    1616/// @{
    17 
    18 #include <pslib.h>
    19 #include "pmFPA.h"
    2017
    2118/// Correct non-linearity through polynomial

  • trunk/psModules/src/detrend/pmShifts.c

    r12504 r12696  
    88#include <pslib.h>
    99
     10#include "pmHDU.h"
     11#include "pmFPA.h"
    1012#include "pmFPALevel.h"
    1113#include "pmFPAUtils.h"

  • trunk/psModules/src/detrend/pmShifts.h

    r12264 r12696  
    11#ifndef PM_SHIFTS_H
    22#define PM_SHIFTS_H
    3 
    4 #include <pslib.h>
    5 #include "pmFPA.h"
    63
    74#define PM_SHIFTS_TABLE_NAME "SHIFTS.TABLE" ///< Name for table on the analysis metadata

  • trunk/psModules/src/detrend/pmShutterCorrection.c

    r12559 r12696  
    88#include <pslib.h>
    99
     10#include "pmHDU.h"
    1011#include "pmFPA.h"
    1112#include "pmHDUUtils.h"

  • trunk/psModules/src/detrend/pmShutterCorrection.h

    r11253 r12696  
    55 * @author Paul Price, IfA
    66 *
    7  * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    8  * @date $Date: 2007-01-24 02:54:15 $
     7 * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     8 * @date $Date: 2007-03-30 21:12:56 $
    99 * Copyright 2006 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    5959 *  terms of dT(x,y) and f'(x,y)
    6060 */
    61 
    62 #include <pslib.h>
    6361
    6462/// Shutter correction parameters, applicable for a single pixel

  • trunk/psModules/src/detrend/pmSkySubtract.c

    r10299 r12696  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-11-30 00:52:21 $
     8 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2007-03-30 21:12:56 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2222#include <math.h>
    2323#include <pslib.h>
     24
     25#include "pmHDU.h"
     26#include "pmFPA.h"
    2427#include "pmSubtractSky.h"
    2528

  • trunk/psModules/src/detrend/pmSkySubtract.h

    r11253 r12696  
    66 * @author GLG, MHPCC
    77 *
    8  * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    9  * @date $Date: 2007-01-24 02:54:15 $
     8 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     9 * @date $Date: 2007-03-30 21:12:56 $
    1010 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    1111 */
    … …  
    1616/// @addtogroup detrend Detrend Creation and Application
    1717/// @{
    18 
    19 #include<stdio.h>
    20 #include<math.h>
    21 #include "pslib.h"
    22 #include "pmFPA.h"
    2318
    2419// XXX: this is pmFit in pmSubtractBias.c, named psFit here.

  • trunk/psModules/src/extras/pmKapaPlots.h

    r11459 r12696  
    44 * @author EAM, IfA
    55 *
    6  * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-31 03:11:35 $
     6 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-30 21:12:56 $
    88 * Copyright 2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    2121
    2222# if (HAVE_KAPA)
    23     # include <kapa.h>
     23# include <kapa.h>
    2424
    25     // yes, this is an absurd name...
    26     bool pmKapaPlotVectorPair_AutoLimits_OpenGraph (int kapa, Graphdata *graphdata, psVector *xVec, psVector *yVec);
     25// yes, this is an absurd name...
     26bool pmKapaPlotVectorPair_AutoLimits_OpenGraph (int kapa, Graphdata *graphdata, psVector *xVec, psVector *yVec);
    2727bool pmKapaPlotVectorTriple_AutoLimits_OpenGraph (int kapa, Graphdata *graphdata, psVector *xVec, psVector *yVec, psVector *zVec, bool increasing);
    2828# else
    2929
    30     bool pmKapaPlotVectorPair_AutoLimits_OpenGraph (int kapa, void *graphdata, psVector *xVec, psVector *yVec);
     30bool pmKapaPlotVectorPair_AutoLimits_OpenGraph (int kapa, void *graphdata, psVector *xVec, psVector *yVec);
    3131bool pmKapaPlotVectorTriple_AutoLimits_OpenGraph (int kapa, void *graphdata, psVector *xVec, psVector *yVec, psVector *zVec, bool increasing);
    3232# endif

  • trunk/psModules/src/imcombine/pmImageCombine.h

    r11253 r12696  
    88 * @author GLG, MHPCC
    99 *
    10  * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    11  * @date $Date: 2007-01-24 02:54:15 $
     10 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     11 * @date $Date: 2007-03-30 21:12:56 $
    1212 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    1313 */
    … …  
    1818/// @addtogroup imcombine Image Combinations
    1919/// @{
    20 
    21 #include <stdio.h>
    22 #include <math.h>
    23 #include <pslib.h>
    2420
    2521psImage *pmCombineImages(

  • trunk/psModules/src/imcombine/pmImageSubtract.h

    r11253 r12696  
    77 * @author GLG, MHPCC
    88 *
    9  * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    10  * @date $Date: 2007-01-24 02:54:15 $
     9 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     10 * @date $Date: 2007-03-30 21:12:56 $
    1111 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    1212 */
    … …  
    1717/// @addtogroup imcombine Image Combinations
    1818/// @{
    19 
    20 #include <stdio.h>
    21 #include <math.h>
    22 #include <pslib.h>
    2319
    2420typedef enum {

  • trunk/psModules/src/imcombine/pmReadoutCombine.c

    r12693 r12696  
    88#include <pslib.h>
    99
     10#include "pmHDU.h"
    1011#include "pmFPA.h"
    1112#include "pmHDUUtils.h"

  • trunk/psModules/src/imcombine/pmReadoutCombine.h

    r11253 r12696  
    55 * @author Paul Price, IfA
    66 *
    7  * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    8  * @date $Date: 2007-01-24 02:54:15 $
     7 * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     8 * @date $Date: 2007-03-30 21:12:56 $
    99 * Copyright 2004-2006 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    1515/// @addtogroup imcombine Image Combinations
    1616/// @{
    17 
    18 #include <pslib.h>
    19 #include "pmFPA.h"
    2017
    2118/// Combination parameters for pmReadoutCombine.

  • trunk/psModules/src/objects/pmGrowthCurve.c

    r9897 r12696  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-11-07 22:55:40 $
     7 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-03-30 21:12:56 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1717
    1818#include <pslib.h>
     19
     20#include "pmHDU.h"
    1921#include "pmFPA.h"
    2022#include "pmPeaks.h"

  • trunk/psModules/src/objects/pmPSF_IO.c

    r11687 r12696  
    66 *  @author EAM, IfA
    77 *
    8  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2007-02-07 23:58:17 $
     8 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2007-03-30 21:12:56 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2222
    2323#include <pslib.h>
     24
     25#include "pmConfig.h"
     26#include "pmDetrendDB.h"
     27
    2428#include "pmHDU.h"
    2529#include "pmFPA.h"
    26 #include "pmFPAfile.h"
     30
     31#include "pmFPALevel.h"
     32#include "pmFPAview.h"
    2733#include "pmFPAfile.h"
    2834

  • trunk/psModules/src/objects/pmSourceIO.c

    r12598 r12696  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2007-03-27 18:52:17 $
     5 *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-03-30 21:12:56 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818#include <string.h>
    1919#include <pslib.h>
     20
     21#include "pmConfig.h"
     22#include "pmDetrendDB.h"
     23
    2024#include "pmHDU.h"
    2125#include "pmFPA.h"
     26#include "pmFPALevel.h"
    2227#include "pmFPAview.h"
    2328#include "pmFPAfile.h"

  • trunk/psModules/src/objects/pmSourceIO_CMF.c

    r11302 r12696  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2007-01-26 04:40:12 $
     5 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-03-30 21:12:56 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2020#include "pmHDU.h"
    2121#include "pmFPA.h"
     22#include "pmFPALevel.h"
    2223#include "pmFPAview.h"
    2324#include "pmFPAfile.h"

  • trunk/psModules/src/objects/pmSourceIO_CMP.c

    r11687 r12696  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2007-02-07 23:58:17 $
     5 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-03-30 21:12:56 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818#include <string.h>
    1919#include <pslib.h>
     20
     21#include "pmConfig.h"
     22#include "pmDetrendDB.h"
     23
    2024#include "pmHDU.h"
    2125#include "pmFPA.h"
     26#include "pmFPALevel.h"
    2227#include "pmFPAview.h"
    2328#include "pmFPAfile.h"

  • trunk/psModules/src/objects/pmSourceIO_OBJ.c

    r10258 r12696  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-11-29 02:36:38 $
     5 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-03-30 21:12:56 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818#include <string.h>
    1919#include <pslib.h>
     20
     21#include "pmConfig.h"
     22#include "pmDetrendDB.h"
     23
    2024#include "pmHDU.h"
    2125#include "pmFPA.h"
     26#include "pmFPALevel.h"
    2227#include "pmFPAview.h"
    2328#include "pmFPAfile.h"

  • trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

    r12628 r12696  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2007-03-28 19:17:14 $
     5 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-03-30 21:12:56 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818#include <string.h>
    1919#include <pslib.h>
     20
     21#include "pmConfig.h"
     22#include "pmDetrendDB.h"
     23
    2024#include "pmHDU.h"
    2125#include "pmFPA.h"
     26#include "pmFPALevel.h"
    2227#include "pmFPAview.h"
    2328#include "pmFPAfile.h"

  • trunk/psModules/src/objects/pmSourceIO_RAW.c

    r11161 r12696  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2007-01-19 04:39:02 $
     5 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-03-30 21:12:56 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818#include <string.h>
    1919#include <pslib.h>
     20
     21#include "pmConfig.h"
     22#include "pmDetrendDB.h"
     23
    2024#include "pmHDU.h"
    2125#include "pmFPA.h"
     26#include "pmFPALevel.h"
    2227#include "pmFPAview.h"
    2328#include "pmFPAfile.h"

  • trunk/psModules/src/objects/pmSourceIO_SMPDATA.c

    r12481 r12696  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2007-03-18 22:03:21 $
     5 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-03-30 21:12:56 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818#include <string.h>
    1919#include <pslib.h>
     20
     21#include "pmConfig.h"
     22#include "pmDetrendDB.h"
     23
    2024#include "pmHDU.h"
    2125#include "pmFPA.h"
     26#include "pmFPALevel.h"
    2227#include "pmFPAview.h"
    2328#include "pmFPAfile.h"

  • trunk/psModules/src/objects/pmSourceIO_SX.c

    r10258 r12696  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-11-29 02:36:38 $
     5 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-03-30 21:12:56 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818#include <string.h>
    1919#include <pslib.h>
     20
     21#include "pmConfig.h"
     22#include "pmDetrendDB.h"
     23
    2024#include "pmHDU.h"
    2125#include "pmFPA.h"
     26#include "pmFPALevel.h"
    2227#include "pmFPAview.h"
    2328#include "pmFPAfile.h"

  • trunk/psModules/src/objects/pmSourcePlotMoments.c

    r11286 r12696  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-01-25 03:11:54 $
     7 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-03-30 21:12:56 $
    99 *
    1010 *  Copyright 2006 IfA, University of Hawaii
    … …  
    2020#include <pslib.h>
    2121
     22#include "pmConfig.h"
     23#include "pmDetrendDB.h"
     24
    2225#include "pmHDU.h"
    2326#include "pmFPA.h"
     27#include "pmFPALevel.h"
     28#include "pmFPAview.h"
    2429#include "pmFPAfile.h"
    25 #include "pmFPAview.h"
    2630#include "pmPeaks.h"
    2731#include "pmMoments.h"

  • trunk/psModules/src/objects/pmSourcePlotPSFModel.c

    r11286 r12696  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-01-25 03:11:54 $
     7 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-03-30 21:12:56 $
    99 *
    1010 *  Copyright 2006 IfA, University of Hawaii
    … …  
    2020#include <pslib.h>
    2121
     22#include "pmConfig.h"
     23#include "pmDetrendDB.h"
     24
    2225#include "pmHDU.h"
    2326#include "pmFPA.h"
     27#include "pmFPALevel.h"
     28#include "pmFPAview.h"
    2429#include "pmFPAfile.h"
    25 #include "pmFPAview.h"
    2630#include "pmPeaks.h"
    2731#include "pmMoments.h"

  • trunk/psModules/src/objects/pmSourcePlots.c

    r10827 r12696  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-12-23 04:00:30 $
     7 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-03-30 21:12:56 $
    99 *
    1010 *  Copyright 2006 IfA, University of Hawaii
    … …  
    2020#include <pslib.h>
    2121
     22#include "pmConfig.h"
     23#include "pmDetrendDB.h"
     24
    2225#include "pmHDU.h"
    2326#include "pmFPA.h"
     27#include "pmFPALevel.h"
     28#include "pmFPAview.h"
    2429#include "pmFPAfile.h"
    25 #include "pmFPAview.h"
    2630#include "pmSourcePlots.h"
    2731

  • trunk/psModules/src/psmodules.h

    r11450 r12696  
    1010#include <pmKapaPlots.h>
    1111
     12// XXX the following headers define constructs needed by the elements below
     13#include <pmConfig.h>
     14#include <pmDetrendDB.h>
     15#include <pmHDU.h>
     16#include <pmFPA.h>
     17#include <pmFPALevel.h>
     18#include <pmFPAview.h>
     19#include <pmFPAfile.h>
     20
    1221// the following headers are from psModule:config
    13 #include <pmConfig.h>
    1422#include <pmConfigRecipes.h>
    1523#include <pmConfigCamera.h>
    … …  
    2533
    2634// the following headers are from psModule:camera
    27 #include <pmHDU.h>
    2835#include <pmHDUUtils.h>
    2936#include <pmHDUGenerate.h>
    30 #include <pmFPA.h>
    31 #include <pmFPALevel.h>
    3237#include <pmFPAFlags.h>
    33 #include <pmFPAview.h>
    34 #include <pmFPAfile.h>
    3538#include <pmFPAfileDefine.h>
    3639#include <pmFPAfileFitsIO.h>
    … …  
    5457#include <pmNonLinear.h>
    5558#include <pmBias.h>
    56 #include <pmDetrendDB.h>
    5759#include <pmShutterCorrection.h>
    5860// #include <pmSkySubtract.h>
Note: See TracChangeset for help on using the changeset viewer.