IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 29, 2009, 6:15:31 PM (17 years ago)
Author:
beaumont
Message:

merged with head

Location:
branches/cnb_branches/cnb_branch_20090301
Files:
8 edited
10 copied

Legend:

Unmodified
Added
Removed

  • branches/cnb_branches/cnb_branch_20090301

  • branches/cnb_branches/cnb_branch_20090301/psastro

  • branches/cnb_branches/cnb_branch_20090301/psastro/src

    • Property svn:ignore

      •  

        old new  
        1616gpcModel
        1717psastroModelFit
         18psastroExtract

  • branches/cnb_branches/cnb_branch_20090301/psastro/src/Makefile.am

    r23352 r23594  
    1010# FORCE: ;
    1111
    12 bin_PROGRAMS = psastro psastroModel psastroModelFit gpcModel
     12bin_PROGRAMS = psastro psastroExtract psastroModel psastroModelFit gpcModel
    1313
    1414psastro_CFLAGS = $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
    1515psastro_LDFLAGS = $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    1616psastro_LDADD = libpsastro.la
     17
     18psastroExtract_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
     19psastroExtract_LDFLAGS = $(PSASTRO_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
     20psastroExtract_LDADD = libpsastro.la
    1721
    1822psastroModel_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
    … …  
    3539        psastroDataSave.c           \
    3640        psastroMetadataStats.c      \
     41        psastroCleanup.c
     42
     43psastroExtract_SOURCES = \
     44        psastroExtract.c                    \
     45        psastroExtractArguments.c           \
     46        psastroExtractParseCamera.c   \
     47        psastroExtractDataLoad.c      \
     48        psastroExtractAnalysis.c      \
     49        psastroExtractStar.c      \
     50        psastroExtractStars.c      \
     51        psastroExtractGhosts.c      \
     52        psastroExtractFindChip.c      \
    3753        psastroCleanup.c
    3854

  • branches/cnb_branches/cnb_branch_20090301/psastro/src/psastro.h

    r23352 r23594  
    5858bool              psastroMaskUpdates (pmConfig *config);
    5959
    60 psPlaneDistort   *psPlaneDistortIdentity ();
    61 bool              psPlaneDistortIsIdentity (psPlaneDistort *distort);
    62 
    63 psArray          *psastroLoadRefstars (pmConfig *config);
     60psArray          *psastroLoadRefstars (pmConfig *config, const char *source);
    6461bool              psastroChipAstrom (pmConfig *config);
    6562bool              psastroOneChip (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
    6663bool              psastroOneChipGrid (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
    6764bool              psastroOneChipFit (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
    68 bool              psastroChooseRefstars (pmConfig *config, psArray *refs);
     65bool              psastroChooseRefstars (pmConfig *config, psArray *refs, const char *source);
    6966bool              psastroRefstarSubset (pmReadout *readout);
    7067pmLumFunc        *psastroLuminosityFunction (psArray *stars, pmLumFunc *rawFunc);
    … …  
    121118bool              psastroDumpCorners (char *filenameU, char *filenameD, pmFPA *fpa);
    122119
     120char             *psastroSetMagLimit (float *minMag, float *maxRho, pmConfig *config, const char *source);
    123121
    124122psArray          *psastroReadGetstarCatalog (psFits *fits);
    … …  
    129127bool              psastroMetadataStats (pmConfig *config);
    130128
    131 bool psastroZeroPoint (pmConfig *config);
    132 bool psastroZeroPointReadout(pmReadout *readout, float zeropt, float exptime);
    133 bool psastroZeroPointFromRecipe (float *zeropt, float *exptime, pmFPA *fpa, psMetadata *recipe);
     129bool              psastroZeroPoint (pmConfig *config);
     130bool              psastroZeroPointReadout(pmReadout *readout, float zeropt, float exptime);
     131bool              psastroZeroPointFromRecipe (float *zeropt, float *exptime, pmFPA *fpa, psMetadata *recipe);
     132
     133// psastroExtract functions
     134bool              psastroExtractAnalysis (pmConfig *config);
     135bool              psastroExtractStars (pmConfig *config);
     136bool              psastroExtractGhosts (pmConfig *config);
     137pmChip           *psastroExtractFindChip (float *xChip, float *yChip, pmFPA *fpa, float xFPA, float yFPA);
     138bool              psastroExtractChipBounds (pmFPA *fpa);
     139
     140psImage          *psastroExtractStar (psImage *input, float x, float y, float dX, float dY);
     141bool              psastroExtractParseCamera (pmConfig *config);
     142bool              psastroExtractDataLoad (pmConfig *config);
     143pmConfig         *psastroExtractArguments (int argc, char **argv);
    134144
    135145///@}

  • branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroAnalysis.c

    r21409 r23594  
    4545
    4646    // load the reference stars overlapping the data stars
    47     psArray *refs = psastroLoadRefstars(config);
     47    psArray *refs = psastroLoadRefstars(config, "PSASTRO.INPUT");
    4848    if (!refs) {
    4949        psError (PSASTRO_ERR_UNKNOWN, false, "failed to load reference data\n");
    … …  
    5656    }
    5757
    58     if (!psastroChooseRefstars (config, refs)) {
     58    if (!psastroChooseRefstars (config, refs, "PSASTRO.INPUT")) {
    5959        psError (PSASTRO_ERR_UNKNOWN, false, "failed to select reference data for chips\n");
    6060        psFree(refs);
    6161        return false;
    6262    }
     63    psFree (refs);  // refs of interest are saved on readout->analysis
    6364
    6465    // check the command-line arguments first
    … …  
    7980        if (!psastroChipAstrom (config)) {
    8081            psError (PSASTRO_ERR_UNKNOWN, false, "failed to perform single chip astrometry\n");
    81             psFree(refs);
    8282            return false;
    8383        }
    … …  
    8686        if (!psastroMosaicAstrom (config)) {
    8787            psError (PSASTRO_ERR_UNKNOWN, false, "failed to perform mosaic camera astrometry\n");
    88             psFree(refs);
    8988            return false;
    9089        }
    … …  
    10099    // psastroStackAstrom (config, refs);
    101100
    102     psFree (refs);
    103101    return true;
    104102}

  • branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroChooseRefstars.c

    r21409 r23594  
    2020}
    2121
    22 bool psastroChooseRefstars (pmConfig *config, psArray *refs) {
     22bool psastroChooseRefstars (pmConfig *config, psArray *refs, const char *source) {
    2323
    2424    bool status;
    … …  
    3535
    3636    // select the input data sources
    37     pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
     37    pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, source);
    3838    if (!input) {
    3939        psError(PSASTRO_ERR_CONFIG, true, "Can't find input data!\n");

  • branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroLoadRefstars.c

    r21422 r23594  
    1414# define ELIXIR_MODE 1
    1515
    16 char *psastroSetMagLimit (float *minMag, float *maxRho, pmConfig *config);
    17 
    18 psArray *psastroLoadRefstars (pmConfig *config) {
     16psArray *psastroLoadRefstars (pmConfig *config, const char *source) {
    1917
    2018    int fd;
    … …  
    6967    float minMag;
    7068    float maxRho;
    71     char *photcode = psastroSetMagLimit (&minMag, &maxRho, config);
     69    char *photcode = psastroSetMagLimit (&minMag, &maxRho, config, source);
    7270    PS_ASSERT (photcode, NULL);
    7371
    … …  
    240238  goto escape; }
    241239
    242 char *psastroSetMagLimit (float *minMag, float *maxRho, pmConfig *config) {
     240char *psastroSetMagLimit (float *minMag, float *maxRho, pmConfig *config, const char *source) {
    243241
    244242    bool status;
    … …  
    249247
    250248    // select the input data sources
    251     pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
     249    pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, source);
    252250    if (!input) {
    253251        psLogMsg ("psastro", PS_LOG_DETAIL, "no supplied reference header data");
Note: See TracChangeset for help on using the changeset viewer.