IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 7019


Ignore:
Timestamp:
Apr 30, 2006, 3:57:06 PM (20 years ago)
Author:
magnier
Message:

major file reorganization

Location:
trunk/psModules
Files:
50 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/configure.ac

    r6872 r7019  
    4949
    5050SRCPATH='${top_srcdir}/src'
    51 SRCDIRS="astrom config detrend imcombine imsubtract objects pslib"
     51SRCDIRS="pslib config concepts camera astrom detrend imcombine objects"
    5252# escape two escapes at this level so \\ gets passed to the shell and \ to perl
    5353SRCINC=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|-I\\\\${SRCPATH=}/\1|g"`
    … …  
    114114  src/Makefile
    115115  src/astrom/Makefile
     116  src/camera/Makefile
    116117  src/config/Makefile
     118  src/concepts/Makefile
    117119  src/detrend/Makefile
    118120  src/imcombine/Makefile
    119   src/imsubtract/Makefile
    120121  src/objects/Makefile
    121122  src/pslib/Makefile
    … …  
    123124  test/astrom/Makefile
    124125  test/config/Makefile
     126  test/camera/Makefile
     127  test/concepts/Makefile
    125128  test/detrend/Makefile
    126129  test/imcombine/Makefile
    127   test/imsubtract/Makefile
    128130  test/objects/Makefile
    129131  test/pslib/Makefile

  • trunk/psModules/src/astrom/Makefile.am

    r7007 r7019  
    44libpsmoduleastrom_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    55libpsmoduleastrom_la_SOURCES  = \
    6         pmFPA.c \
    7         pmFPAConstruct.c \
    8         pmFPACopy.c \
    9         pmFPAHeader.c \
    10         pmFPARead.c \
    11         pmFPAUtils.c \
    12         pmFPAWrite.c \
    13         pmHDU.c \
    14         pmHDUUtils.c \
    15         pmReadout.c \
    16         pmChipMosaic.c \
    17         pmConcepts.c \
    18         pmConceptsRead.c \
    19         pmConceptsWrite.c \
    20         pmConceptsStandard.c \
    21         pmFPA_JPEG.c \
    22         pmFPAview.c \
    23         pmFPAfile.c \
    246        pmAstrometryObjects.c
    257
    26 #       pmFPAMaskWeight.c \
    278#       pmFPAAstrometry.c
    28 #       pmChipMosaic.c
    299
    3010psmoduleincludedir = $(includedir)
    3111psmoduleinclude_HEADERS = \
    32         pmFPA.h \
    33         pmFPAConstruct.h \
    34         pmFPACopy.h \
    35         pmFPAHeader.h \
    36         pmFPARead.h \
    37         pmFPAUtils.h \
    38         pmFPAWrite.h \
    39         pmHDU.h \
    40         pmHDUUtils.h \
    41         pmReadout.h \
    42         pmChipMosaic.h \
    43         pmConcepts.h \
    44         pmConceptsRead.h \
    45         pmConceptsWrite.h \
    46         pmConceptsStandard.h \
    47         pmFPA_JPEG.h \
    48         pmFPAview.h \
    49         pmFPAfile.h \
    5012        pmAstrometryObjects.h
    5113
    52 #       pmFPAMaskWeight.h \
    5314#       pmFPAAstrometry.h
    54 #       pmAstrometryObjects.h
    55 #       pmChipMosaic.h

  • trunk/psModules/src/imcombine/Makefile.am

    r6872 r7019  
    33libpsmoduleimcombine_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
    44libpsmoduleimcombine_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    5 libpsmoduleimcombine_la_SOURCES  = pmImageCombine.c
     5
     6libpsmoduleimcombine_la_SOURCES  = \
     7     pmImageCombine.c \
     8     pmImageSubtract.c
    69#    pmReadoutCombine.c
    710
    811psmoduleincludedir = $(includedir)
    912psmoduleinclude_HEADERS = \
    10     pmImageCombine.h
     13    pmImageCombine.h \
     14    pmImageSubtract.h
    1115#    pmReadoutCombine.h

  • trunk/psModules/src/imsubtract/Makefile.am

    r6872 r7019  
    33libpsmoduleimsubtract_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
    44libpsmoduleimsubtract_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    5 libpsmoduleimsubtract_la_SOURCES  = pmImageSubtract.c \
    6     pmSubtractBias.c
    7 #    pmSubtractSky.c
     5libpsmoduleimsubtract_la_SOURCES  =
     6
     7# pmImageSubtract.c \
     8#  pmSubtractBias.c
     9#   pmSubtractSky.c
    810
    911psmoduleincludedir = $(includedir)
    10 psmoduleinclude_HEADERS = \
    11     pmImageSubtract.h \
    12     pmSubtractBias.h
     12psmoduleinclude_HEADERS =
     13
     14#    pmImageSubtract.h \
     15#    pmSubtractBias.h
    1316#    pmSubtractSky.h

  • trunk/psModules/src/psmodules.h

    r7004 r7019  
    2121#include <pmConfig.h>
    2222
    23 // the following headers are from psModule:astrom
     23// the following headers are from psModule:concepts
    2424#include <pmConcepts.h>
    2525#include <pmConceptsRead.h>
    2626#include <pmConceptsStandard.h>
    2727#include <pmConceptsWrite.h>
     28
     29// the following headers are from psModule:camera
    2830#include <pmHDU.h>
    2931#include <pmHDUUtils.h>
    … …  
    3941#include <pmFPA_JPEG.h>
    4042#include <pmReadout.h>
     43
     44// the following headers are from psModule:astrom
    4145#include <pmAstrometryObjects.h>
    4246#include <pmChipMosaic.h>
    … …  
    4953#include <pmMaskBadPixelsErrors.h>
    5054#include <pmNonLinear.h>
     55#include <pmSubtractBias.h>
     56// #include <pmSubtractSky.h>
    5157
    5258// the following headers are from psModule:imcombine
    5359#include <pmImageCombine.h>
     60#include <pmImageSubtract.h>
    5461// #include <pmReadoutCombine.h>
    55 
    56 // the following headers are from psModule:detrend
    57 #include <pmSubtractBias.h>
    58 #include <pmImageSubtract.h>
    59 // #include <pmSubtractSky.h>
    6062
    6163// the following headers are from psModule:objects

  • trunk/psModules/test/camera/Makefile.am

    r5316 r7019  
    33AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
    44AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
     5AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    56
    6 TESTS =
     7TESTS =\
     8    tst_pmAstrometry
     9
     10tst_pmAstrometry_SOURCES = tst_pmAstrometry.c
    711
    812check_PROGRAMS = $(TESTS)
Note: See TracChangeset for help on using the changeset viewer.