IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

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/camera
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.