IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 18, 2008, 8:38:14 AM (18 years ago)
Author:
eugene
Message:

renaming pmAstrometryTable to pmAstrometryModel; adding pmAstrometryRefstars; using PS_DEG_RAD, PS_RAD_DEG

Location:
trunk/psModules/src/astrom
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r15562 r17036  
    88        pmAstrometryDistortion.c \
    99        pmAstrometryUtils.c \
    10         pmAstrometryTable.c \
     10        pmAstrometryModel.c \
     11        pmAstrometryRefstars.c \
    1112        pmAstrometryWCS.c
    1213
    … …  
    1617        pmAstrometryDistortion.h \
    1718        pmAstrometryUtils.h \
    18         pmAstrometryTable.h \
     19        pmAstrometryModel.h \
     20        pmAstrometryRefstars.h \
    1921        pmAstrometryWCS.h
    2022

  • trunk/psModules/src/astrom/pmAstrometryObjects.c

    r16069 r17036  
    88*  @author EAM, IfA
    99*
    10 *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2008-01-15 02:49:45 $
     10*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2008-03-18 18:38:14 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3232#include "pmFPA.h"
    3333#include "pmAstrometryObjects.h"
    34 
    35 # define DEG_RAD 57.295779513082322
    36 # define RAD_DEG  0.017453292519943
    3734
    3835#define PM_ASTROMETRYOBJECTS_DEBUG 1
    … …  
    726723    double delScale = psMetadataLookupF32 (&status, config, "PSASTRO.GRID.DEL.SCALE");
    727724
    728     double minAngle = RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MIN.ANGLE");
    729     double maxAngle = RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MAX.ANGLE");
    730     double delAngle = RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.DEL.ANGLE");
     725    double minAngle = PS_RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MIN.ANGLE");
     726    double maxAngle = PS_RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MAX.ANGLE");
     727    double delAngle = PS_RAD_DEG*psMetadataLookupF32 (&status, config, "PSASTRO.GRID.DEL.ANGLE");
    731728    double minSigma = psMetadataLookupF32 (&status, config, "PSASTRO.GRID.MIN.SIGMA");
    732729
    … …  
    762759                *minStat = *newStat;
    763760                psLogMsg ("psModule.astrom", 4, "grid test - offset: %7.2f,%7.2f @ %6.1f deg x %7.3f (%4d pts, %5.1f sig, %5.1f var, %6.3f log metric) *",
    764                           minStat->offset.x, minStat->offset.y, DEG_RAD*minStat->angle, minStat->scale, minStat->nMatch, minStat->nSigma, minStat->minVar, log10(minStat->minMetric));
     761                          minStat->offset.x, minStat->offset.y, PS_DEG_RAD*minStat->angle, minStat->scale, minStat->nMatch, minStat->nSigma, minStat->minVar, log10(minStat->minMetric));
    765762            } else {
    766763                psLogMsg ("psModule.astrom", 4, "grid test - offset: %7.2f,%7.2f @ %6.1f deg x %7.3f (%4d pts, %5.1f sig, %5.1f var, %6.3f log metric)",
    767                           newStat->offset.x, newStat->offset.y, DEG_RAD*newStat->angle, newStat->scale, newStat->nMatch, newStat->nSigma, newStat->minVar, log10(newStat->minMetric));
     764                          newStat->offset.x, newStat->offset.y, PS_DEG_RAD*newStat->angle, newStat->scale, newStat->nMatch, newStat->nSigma, newStat->minVar, log10(newStat->minMetric));
    768765
    769766            }
    … …  
    773770    }
    774771    psLogMsg ("psModule.astrom.grid.match", 4, "grid best - offset: %7.2f,%7.2f @ %6.1f deg x %7.3f (%4d pts, %5.1f sig, %5.1f var, %6.3f log metric)",
    775               minStat->offset.x, minStat->offset.y, DEG_RAD*minStat->angle, minStat->scale, minStat->nMatch, minStat->nSigma, minStat->minVar, log10(minStat->minMetric));
     772              minStat->offset.x, minStat->offset.y, PS_DEG_RAD*minStat->angle, minStat->scale, minStat->nMatch, minStat->nSigma, minStat->minVar, log10(minStat->minMetric));
    776773
    777774    // I need to decide if a solution is likely to be a good solution or just a mis-match

  • trunk/psModules/src/astrom/pmAstrometryWCS.c

    r16068 r17036  
    77 *  @author EAM, IfA
    88 *
    9  *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2008-01-15 02:48:58 $
     9 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2008-03-18 18:38:14 $
    1111 *
    1212 *  Copyright 2006 Institute for Astronomy, University of Hawaii
    … …  
    339339    psFree (type);
    340340
    341     psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL1", PS_META_REPLACE, "", wcs->toSky->R*PM_DEG_RAD);
    342     psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL2", PS_META_REPLACE, "", wcs->toSky->D*PM_DEG_RAD);
     341    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL1", PS_META_REPLACE, "", wcs->toSky->R*PS_DEG_RAD);
     342    psMetadataAddF64 (header, PS_LIST_TAIL, "CRVAL2", PS_META_REPLACE, "", wcs->toSky->D*PS_DEG_RAD);
    343343
    344344    psMetadataAddF64 (header, PS_LIST_TAIL, "CRPIX1", PS_META_REPLACE, "", wcs->crpix1);
    … …  
    604604    // convert projection from FPA to SKY into wcs projection (degrees to radians)
    605605    wcs->toSky = psProjectionAlloc (fpa->toSky->R, fpa->toSky->D, PM_RAD_DEG, PM_RAD_DEG, fpa->toSky->type);
    606     wcs->crval1 = fpa->toSky->R*PM_DEG_RAD;
    607     wcs->crval2 = fpa->toSky->D*PM_DEG_RAD;
     606    wcs->crval1 = fpa->toSky->R*PS_DEG_RAD;
     607    wcs->crval2 = fpa->toSky->D*PS_DEG_RAD;
    608608
    609609    // given transformation, solve for coordinates which yields output coordinates of 0,0
    … …  
    620620
    621621    // pdelt1,2 has units of degrees/micron
    622     double pdelt1 = fpa->toSky->Xs * PM_DEG_RAD;
    623     double pdelt2 = fpa->toSky->Ys * PM_DEG_RAD;
     622    double pdelt1 = fpa->toSky->Xs * PS_DEG_RAD;
     623    double pdelt2 = fpa->toSky->Ys * PS_DEG_RAD;
    624624
    625625    // convert wcs->trans to a matrix with units of degrees/pixel
    … …  
    696696    // convert projection from TPA to SKY into wcs projection (degrees to radians)
    697697    wcs->toSky = psProjectionAlloc (fpa->toSky->R, fpa->toSky->D, PM_RAD_DEG, PM_RAD_DEG, PS_PROJ_DIS);
    698     wcs->crval1 = fpa->toSky->R*PM_DEG_RAD;
    699     wcs->crval2 = fpa->toSky->D*PM_DEG_RAD;
     698    wcs->crval1 = fpa->toSky->R*PS_DEG_RAD;
     699    wcs->crval2 = fpa->toSky->D*PS_DEG_RAD;
    700700
    701701    // given transformation, solve for coordinates which yields output coordinates of 0,0
    … …  
    712712
    713713    // pdelt1,2 has units of degrees/micron
    714     double pdelt1 = fpa->toSky->Xs * PM_DEG_RAD;
    715     double pdelt2 = fpa->toSky->Ys * PM_DEG_RAD;
     714    double pdelt1 = fpa->toSky->Xs * PS_DEG_RAD;
     715    double pdelt2 = fpa->toSky->Ys * PS_DEG_RAD;
    716716
    717717    // convert wcs->trans to units of degree/micron
Note: See TracChangeset for help on using the changeset viewer.