IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6565


Ignore:
Timestamp:
Mar 8, 2006, 6:25:04 PM (20 years ago)
Author:
Paul Price
Message:

Building without objects until discrepancies between PAP and EAM over pmHDU,pmFPA,etc are resolved

Location:
branches/rel10_ifa/psModules
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/rel10_ifa/psModules/configure.ac

    r6563 r6565  
    8181AM_CONDITIONAL(DOXYGEN, test x$doxygen = xtrue)
    8282
     83dnl libjpeg -------------------------------------------------------------------
     84
     85AC_CHECK_LIB(jpeg,jpeg_CreateCompress,[],[AC_MSG_ERROR([jpeg library not found.])])
     86
    8387dnl pslib ---------------------------------------------------------------------
    8488AC_ARG_WITH(pslib-config,

  • branches/rel10_ifa/psModules/src/astrom/Makefile.am

    r6552 r6565  
    1313        pmConceptsWrite.c \
    1414        pmConceptsStandard.c
    15 #       pmChipMosaic.c
    1615#       pmFPAfile.c
    1716#       pmFPAview.c
     17#       pmChipMosaic.c
    1818#       pmFPAWrite.c
    1919#       pmFPAAstrometry.c
    … …  
    3232        pmConceptsWrite.h \
    3333        pmConceptsStandard.h
    34 #       pmChipMosaic.h
    3534#       pmFPAfile.c
    3635#       pmFPAview.c
     36#       pmChipMosaic.h
    3737#       pmFPAWrite.h
    3838#       pmFPAAstrometry.h

  • branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c

    r6521 r6565  
    1 # include "pmFPAfile.h"
     1#include <stdio.h>
     2#include "pslib.h"
     3#include "pmFPAview.h"
     4#include "pmFPAfile.h"
    25
    36static void pmPFAfileFree (pmFPAfile *file)

  • branches/rel10_ifa/psModules/src/objects/Makefile.am

    r6557 r6565  
    33libpsmoduleobjects_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS) -I../pslib/
    44libpsmoduleobjects_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    5 libpsmoduleobjects_la_SOURCES  = \
    6     pmPeaks.c \
    7     pmMoments.c \
    8     pmModel.c \
    9     pmModelGroup.c \
    10     pmSource.c \
    11     pmSourceSky.c \
    12     pmSourceContour.c \
    13     pmSourceFitModel.c \
    14     pmSourceFitSet.c \
    15     pmSourcePhotometry.c \
    16     pmSourceIO.c \
    17     pmSourceIO_CMF.c \
    18     pmSourceIO_CMP.c \
    19     pmSourceIO_OBJ.c \
    20     pmSourceIO_SX.c \
    21     pmPSF.c \
    22     pmPSFtry.c \
    23     pmGrowthCurve.c \
    24     pmFPAviewReadObjects.c \
    25     pmFPAviewWriteObjects.c
     5libpsmoduleobjects_la_SOURCES  =
     6#     pmPeaks.c \
     7#     pmMoments.c \
     8#     pmModel.c \
     9#     pmModelGroup.c \
     10#     pmSource.c \
     11#     pmSourceSky.c \
     12#     pmSourceContour.c \
     13#     pmSourceFitModel.c \
     14#     pmSourceFitSet.c \
     15#     pmSourcePhotometry.c \
     16#     pmSourceIO.c \
     17#     pmSourceIO_CMF.c \
     18#     pmSourceIO_CMP.c \
     19#     pmSourceIO_OBJ.c \
     20#     pmSourceIO_SX.c \
     21#     pmPSF.c \
     22#     pmPSFtry.c \
     23#     pmGrowthCurve.c \
     24#     pmFPAviewReadObjects.c \
     25#     pmFPAviewWriteObjects.c
    2626
    2727EXTRA_DIST = \
    … …  
    3232
    3333psmoduleincludedir = $(includedir)
    34 psmoduleinclude_HEADERS = \
    35     pmPeaks.h \
    36     pmMoments.h \
    37     pmModel.h \
    38     pmModelGroup.h \
    39     pmSource.h \
    40     pmSourceSky.h \
    41     pmSourceContour.h \
    42     pmSourceFitModel.h \
    43     pmSourceFitSet.h \
    44     pmSourcePhotometry.h \
    45     pmSourceIO.h \
    46     pmPSF.h \
    47     pmPSFtry.h \
    48     pmGrowthCurve.h
     34psmoduleinclude_HEADERS =
     35#     pmPeaks.h \
     36#     pmMoments.h \
     37#     pmModel.h \
     38#     pmModelGroup.h \
     39#     pmSource.h \
     40#     pmSourceSky.h \
     41#     pmSourceContour.h \
     42#     pmSourceFitModel.h \
     43#     pmSourceFitSet.h \
     44#     pmSourcePhotometry.h \
     45#     pmSourceIO.h \
     46#     pmPSF.h \
     47#     pmPSFtry.h \
     48#     pmGrowthCurve.h

  • branches/rel10_ifa/psModules/src/objects/models/pmModel_RGAUSS.c

    r5257 r6565  
    117117    psVector *params = model->params;
    118118
    119     EllipseAxes axes;
    120     EllipseShape shape;
    121     EllipseMoments moments;
     119    psEllipseAxes axes;
     120    psEllipseShape shape;
     121    psEllipseMoments moments;
    122122
    123123    moments.x2 = PS_SQR(source->moments->Sx);
    … …  
    125125    moments.xy = source->moments->Sxy;
    126126
    127     axes = EllipseMomentsToAxes(moments);
    128     shape = EllipseAxesToShape(axes);
     127    axes = psEllipseMomentsToAxes(moments);
     128    shape = psEllipseAxesToShape(axes);
    129129
    130130    params->data.F32[0] = source->moments->Sky;

  • branches/rel10_ifa/psModules/src/objects/models/pmModel_SGAUSS.c

    r6448 r6565  
    1717
    1818# define SQ(A)((A)*(A))
    19 psF64 psImageEllipseContour (EllipseAxes axes, double xc, double yc, psImage *image);
     19psF64 psImageEllipseContour (psEllipseAxes axes, double xc, double yc, psImage *image);
    2020psF64 p_psImageGetElementF64(psImage *a, int i, int j);
    2121
    … …  
    9999
    100100// measure the flux for the elliptical contour
    101 psF64 psImageEllipseContour (EllipseAxes axes, double xc, double yc, psImage *image)
     101psF64 psImageEllipseContour (psEllipseAxes axes, double xc, double yc, psImage *image)
    102102{
    103103
    … …  
    145145    psF32     *params   = model->params->data.F32;
    146146
    147     EllipseAxes axes;
    148     EllipseShape shape;
    149     EllipseMoments moments;
     147    psEllipseAxes axes;
     148    psEllipseShape shape;
     149    psEllipseMoments moments;
    150150
    151151    moments.x2 = PS_SQR(sMoments->Sx);
    … …  
    154154
    155155    // solve the math to go from Moments To Shape
    156     axes = EllipseMomentsToAxes(moments);
    157     shape = EllipseAxesToShape(axes);
     156    axes = psEllipseMomentsToAxes(moments);
     157    shape = psEllipseAxesToShape(axes);
    158158
    159159    params[0] = sMoments->Sky;
    … …  
    195195    float f1, f2;
    196196
    197     EllipseAxes axes;
    198     EllipseShape shape;
    199     EllipseMoments moments;
     197    psEllipseAxes axes;
     198    psEllipseShape shape;
     199    psEllipseMoments moments;
    200200
    201201    moments.x2 = PS_SQR(sMoments->Sx);
    … …  
    204204
    205205    // solve the math to go from Moments To Shape
    206     axes = EllipseMomentsToAxes(moments);
    207     shape = EllipseAxesToShape(axes);
     206    axes = psEllipseMomentsToAxes(moments);
     207    shape = psEllipseAxesToShape(axes);
    208208
    209209    params[0] = sMoments->Sky;
    … …  
    264264    psF32 *PAR = params->data.F32;
    265265
    266     EllipseAxes axes;
    267     EllipseShape shape;
     266    psEllipseAxes axes;
     267    psEllipseShape shape;
    268268
    269269    if (flux <= 0)
    … …  
    279279    shape.sxy = PAR[6];
    280280
    281     axes = EllipseShapeToAxes (shape);
     281    axes = psEllipseShapeToAxes (shape);
    282282    psF64 dr = 1.0 / axes.major;
    283283    psF64 limit = flux / PAR[1];
    … …  
    323323    psF32 dP;
    324324    bool  status;
    325     EllipseAxes axes;
    326     EllipseShape shape;
     325    psEllipseAxes axes;
     326    psEllipseShape shape;
    327327
    328328    psF32 *PAR  = model->params->data.F32;
    … …  
    333333    shape.sxy = PAR[6];
    334334
    335     axes = EllipseShapeToAxes (shape);
     335    axes = psEllipseShapeToAxes (shape);
    336336
    337337    dP = 0;

  • branches/rel10_ifa/psModules/src/objects/models/pmModel_ZGAUSS.c

    r5257 r6565  
    8585    psF32 *PAR = params->data.F32;
    8686
    87     EllipseAxes axes;
    88     EllipseShape shape;
     87    psEllipseAxes axes;
     88    psEllipseShape shape;
    8989
    9090    if (flux <= 0)
    … …  
    100100    shape.sxy = PAR[6];
    101101
    102     axes = EllipseShapeToAxes (shape);
     102    axes = psEllipseShapeToAxes (shape);
    103103    psF64 dr = 1.0 / axes.major;
    104104    psF64 limit = flux / PAR[1];
    … …  
    124124    psVector *params = model->params;
    125125
    126     EllipseAxes axes;
    127     EllipseShape shape;
    128     EllipseMoments moments;
     126    psEllipseAxes axes;
     127    psEllipseShape shape;
     128    psEllipseMoments moments;
    129129
    130130    moments.x2 = PS_SQR(source->moments->Sx);
    … …  
    132132    moments.xy = source->moments->Sxy;
    133133
    134     axes = EllipseMomentsToAxes(moments);
    135     shape = EllipseAxesToShape(axes);
     134    axes = psEllipseMomentsToAxes(moments);
     135    shape = psEllipseAxesToShape(axes);
    136136
    137137    params->data.F32[0] = source->moments->Sky;

  • branches/rel10_ifa/psModules/src/objects/pmObjects.h

    r6545 r6565  
    1010 *  @author GLG, MHPCC
    1111 *
    12  *  @version $Revision: 1.5.4.2 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2006-03-08 18:01:07 $
     12 *  @version $Revision: 1.5.4.3 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2006-03-09 04:25:03 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727#include <math.h>
    2828#include "pslib.h"
    29 #include "pmFPA.h"
    3029
    3130/**

  • branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMF.c

    r6556 r6565  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-03-09 03:14:23 $
     5 *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-03-09 04:25:03 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3939    float lsky;
    4040    bool status;
    41     EllipseShape shape;
    42     EllipseAxes axes;
     41    psEllipseShape shape;
     42    psEllipseAxes axes;
    4343
    4444    // find config information for output header
    … …  
    6363        shape.sy  = PAR[5];
    6464        shape.sxy = PAR[6];
    65         axes = EllipseShapeToAxes (shape);
     65        axes = psEllipseShapeToAxes (shape);
    6666
    6767        row = psMetadataAlloc ();
    … …  
    9898    bool status;
    9999    psF32 *PAR, *dPAR;
    100     EllipseShape shape;
    101     EllipseAxes axes;
     100    psEllipseShape shape;
     101    psEllipseAxes axes;
    102102    float lsky;
    103103
    … …  
    140140        axes.theta     = psMetadataLookupF32 (&status, row, "THETA");
    141141
    142         shape = EllipseAxesToShape (axes);
     142        shape = psEllipseAxesToShape (axes);
    143143
    144144        PAR[4] = shape.sx;

  • branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMP.c

    r6556 r6565  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-03-09 03:14:23 $
     5 *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-03-09 04:25:03 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3636    float dmag, lsky;
    3737    bool status;
    38     EllipseShape shape;
    39     EllipseAxes axes;
     38    psEllipseShape shape;
     39    psEllipseAxes axes;
    4040
    4141    // find config information for output header
    … …  
    9090        shape.sy  = PAR[5];
    9191        shape.sxy = PAR[6];
    92         axes = EllipseShapeToAxes (shape);
     92        axes = psEllipseShapeToAxes (shape);
    9393
    9494        psLineInit (line);
    … …  
    120120    psF32 *PAR, *dPAR;
    121121    bool status;
    122     EllipseShape shape;
    123     EllipseAxes axes;
     122    psEllipseShape shape;
     123    psEllipseAxes axes;
    124124
    125125    // define PSF model type
    … …  
    226226            axes.theta  = atof (array->data[10]);
    227227
    228             shape = EllipseAxesToShape (axes);
     228            shape = psEllipseAxesToShape (axes);
    229229
    230230            PAR[4] = shape.sx;

  • branches/rel10_ifa/psModules/src/objects/pmSourceIO_OBJ.c

    r6556 r6565  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-03-09 03:14:23 $
     5 *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-03-09 04:25:03 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3434    psF32 *PAR, *dPAR;
    3535    float dmag, apResid;
    36     EllipseShape shape;
    37     EllipseAxes axes;
     36    psEllipseShape shape;
     37    psEllipseAxes axes;
    3838
    3939    psTimerStart ("string");
    … …  
    6868        shape.sy  = PAR[5];
    6969        shape.sxy = PAR[6];
    70         axes = EllipseShapeToAxes (shape);
     70        axes = psEllipseShapeToAxes (shape);
    7171
    7272        psLineInit (line);

  • branches/rel10_ifa/psModules/src/objects/pmSourceIO_SX.c

    r6556 r6565  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-03-09 03:14:23 $
     5 *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-03-09 04:25:03 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3232
    3333    psF32 *PAR, *dPAR;
    34     EllipseShape shape;
    35     EllipseAxes axes;
     34    psEllipseShape shape;
     35    psEllipseAxes axes;
    3636
    3737    psLine *line = psLineAlloc (110);  // 110 is sextractor line length
    … …  
    5858        shape.sy  = PAR[5];
    5959        shape.sxy = PAR[6];
    60         axes = EllipseShapeToAxes (shape);
     60        axes = psEllipseShapeToAxes (shape);
    6161
    6262        psLineInit (line);

  • branches/rel10_ifa/psModules/src/pslib/Makefile.am

    r6530 r6565  
    44libpsmodulepslib_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    55libpsmodulepslib_la_SOURCES  = \
    6     psAdditionals.c \
     6    psEllipse.c \
    77    psImageJpeg.c \
    88    psLine.c \
    … …  
    1212psmoduleincludedir = $(includedir)
    1313psmoduleinclude_HEADERS = \
    14     psAdditionals.h \
     14    psEllipse.h \
    1515    psImageJpeg.h \
    1616    psLine.h \

  • branches/rel10_ifa/psModules/src/pslib/psEllipse.c

    r6547 r6565  
    22# include "psEllipse.h"
    33
    4 EllipseAxes EllipseMomentsToAxes (EllipseMoments moments)
     4psEllipseAxes psEllipseMomentsToAxes (psEllipseMoments moments)
    55{
    66
    7     EllipseAxes axes;
     7    psEllipseAxes axes;
    88
    99    double f = sqrt (0.25*PS_SQR(moments.x2 - moments.y2) + PS_SQR(moments.xy));
    … …  
    2020}
    2121
    22 EllipseShape EllipseAxesToShape (EllipseAxes axes)
     22psEllipseShape psEllipseAxesToShape (psEllipseAxes axes)
    2323{
    2424
    25     EllipseShape shape;
     25    psEllipseShape shape;
    2626
    2727    double r1 = 1.0 / PS_SQR(axes.major) + 1.0 / PS_SQR(axes.minor);
    … …  
    3838}
    3939
    40 EllipseAxes EllipseShapeToAxes (EllipseShape shape)
     40psEllipseAxes psEllipseShapeToAxes (psEllipseShape shape)
    4141{
    4242
    43     EllipseAxes axes;
     43    psEllipseAxes axes;
    4444
    4545    double f1 = 1.0 / PS_SQR(shape.sx) + 1.0 / PS_SQR(shape.sy);

  • branches/rel10_ifa/psModules/src/pslib/psEllipse.h

    r6547 r6565  
    66    double theta;
    77}
    8 EllipseAxes;
     8psEllipseAxes;
    99
    1010typedef struct
    … …  
    1414    double xy;
    1515}
    16 EllipseMoments;
     16psEllipseMoments;
    1717
    1818typedef struct
    … …  
    2222    double sxy;
    2323}
    24 EllipseShape;
     24psEllipseShape;
    2525
    2626// conversions between elliptical shape representations
    27 EllipseAxes EllipseMomentsToAxes (EllipseMoments moments);
    28 EllipseShape EllipseAxesToShape (EllipseAxes axes);
    29 EllipseAxes EllipseShapeToAxes (EllipseShape shape);
     27psEllipseAxes psEllipseMomentsToAxes (psEllipseMoments moments);
     28psEllipseShape psEllipseAxesToShape (psEllipseAxes axes);
     29psEllipseAxes psEllipseShapeToAxes (psEllipseShape shape);
    3030

  • branches/rel10_ifa/psModules/src/psmodules.h

    r6555 r6565  
    44#include "pslib.h"
    55
     6#include "psImageJpeg.h"
     7#include "psLine.h"
     8#include "psPolynomialUtils.h"
     9#include "psSparse.h"
     10#include "psEllipse.h"
    611//#include "pmChipMosaic.h"
    712#include "pmConcepts.h"
    … …  
    914#include "pmConceptsStandard.h"
    1015#include "pmConceptsWrite.h"
     16#include "pmHDU.h"
    1117#include "pmFPA.h"
    1218//#include "pmFPAAstrometry.h"
    … …  
    1622#include "pmReadout.h"
    1723//#include "pmFPAfile.h"
    18 #include "pmConfig.h"
    19 #include "pmHDU.h"
    2024//#include "pmFPAview.h"
    2125#include "pmConfig.h"
    … …  
    2630#include "pmNonLinear.h"
    2731#include "pmImageCombine.h"
    28 #include "pmReadoutCombine.h"
     32//#include "pmReadoutCombine.h"
    2933#include "pmImageSubtract.h"
    3034#include "pmSubtractBias.h"
    3135//#include "pmSubtractSky.h"
    32 #include "pmGrowthCurve.h"
    33 #include "pmModelGroup.h"
    34 #include "pmObjects.h"
    35 #include "pmPSF.h"
    36 #include "pmPSFtry.h"
    37 #include "psEllipse.h"
    3836
     37// #include "pmGrowthCurve.h"
     38// #include "pmObjects.h"
     39// #include "pmObjectsIO.h"
     40// #include "pmModel.h"
     41// #include "pmPSF.h"
     42// #include "pmPSFtry.h"
     43// #include "pmMoments.h"
     44// #include "pmPeaks.h"
     45// #include "pmSource.h"
     46// #include "pmSourceContour.h"
     47// #include "pmSourceFitModel.h"
     48// #include "pmSourceFitSet.h"
     49// #include "pmSourcePhotometry.h"
     50// #include "pmSourceSky.h"
     51// #include "pmSourceIO.h"
     52// #include "pmModelGroup.h"
    3953
    4054#endif
Note: See TracChangeset for help on using the changeset viewer.