IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 9, 2008, 2:39:01 PM (18 years ago)
Author:
beaumont
Message:

merged mainline into branch. resolved conflicts. added plots.

Location:
branches/cnb_branch_20080830/psastro/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/cnb_branch_20080830/psastro/src

    • Property svn:ignore

      •  

        old new  
        1515psastroModel
        1616gpcModel
         17psastroModelFit

  • branches/cnb_branch_20080830/psastro/src/Makefile.am

    r19300 r20033  
    11
    22lib_LTLIBRARIES = libpsastro.la
    3 libpsastro_la_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSASTRO_CFLAGS)
     3libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
     4libpsastro_la_LDFLAGS = $(PSASTRO_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    45
    5 bin_PROGRAMS = psastro psastroModel gpcModel
     6bin_PROGRAMS = psastro psastroModel psastroModelFit gpcModel
    67
    7 psastro_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS)
    8 psastro_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PPSTATS_LIBS) $(PSASTRO_LIBS)
     8psastro_CFLAGS = $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
     9psastro_LDFLAGS = $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    910psastro_LDADD = libpsastro.la
    1011
    11 psastroModel_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSASTRO_CFLAGS)
    12 psastroModel_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSASTRO_LIBS)
     12psastroModel_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
     13psastroModel_LDFLAGS = $(PSASTRO_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    1314psastroModel_LDADD = libpsastro.la
    1415
    15 gpcModel_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSASTRO_CFLAGS)
    16 gpcModel_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSASTRO_LIBS)
     16psastroModelFit_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
     17psastroModelFit_LDFLAGS = $(PSASTRO_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
     18psastroModelFit_LDADD = libpsastro.la
     19
     20gpcModel_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
     21gpcModel_LDFLAGS = $(PSASTRO_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    1722gpcModel_LDADD = libpsastro.la
    1823
    … …  
    3843        psastroCleanup.c
    3944
     45psastroModelFit_SOURCES = \
     46        psastroModelFit.c \
     47        psastroModelBoresite.c      \
     48        psastroModelFitBoresite.c
     49
    4050gpcModel_SOURCES = gpcModel.c
    4151
    … …  
    5060        psastroConvert.c            \
    5161        psastroChipAstrom.c         \
    52         psastroOneChip.c            \
    5362        psastroOneChipGrid.c        \
    5463        psastroOneChipFit.c         \
    … …  
    5766        psastroTestFuncs.c          \
    5867        psastroLuminosityFunction.c \
     68        psastroLuminosityFunctionPlot.c \
    5969        psastroRefstarSubset.c      \
    6070        psastroFixChips.c           \
    … …  
    6272        psastroUseModel.c           \
    6373        psastroMosaicAstrom.c       \
     74        psastroMosaicDistortion.c   \
     75        psastroMosaicFPtoTP.c       \
    6476        psastroMosaicGradients.c    \
     77        psastroMosaicCorrectDistortion.c   \
    6578        psastroMosaicChipAstrom.c   \
    6679        psastroMosaicOneChip.c      \
Note: See TracChangeset for help on using the changeset viewer.