IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 17036


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
Files:
12 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

  • trunk/psModules/src/camera/pmFPAfile.c

    r16948 r17036  
    443443    return PM_FPA_FILE_HEADER;
    444444  }
     445  // deprecate this?
    445446  if (!strcasecmp (type, "ASTROM"))     {
    446     return PM_FPA_FILE_ASTROM;
     447    return PM_FPA_FILE_ASTROM_MODEL;
     448  }
     449  if (!strcasecmp (type, "ASTROM.MODEL"))     {
     450    return PM_FPA_FILE_ASTROM_MODEL;
     451  }
     452  if (!strcasecmp (type, "ASTROM.REFSTARS"))     {
     453    return PM_FPA_FILE_ASTROM_REFSTARS;
    447454  }
    448455
    … …  
    481488    case PM_FPA_FILE_HEADER:
    482489      return ("HEADER");
    483     case PM_FPA_FILE_ASTROM:
    484       return ("ASTROM");
     490    case PM_FPA_FILE_ASTROM_MODEL:
     491      return ("ASTROM.MODEL");
     492    case PM_FPA_FILE_ASTROM_REFSTARS:
     493      return ("ASTROM.REFSTARS");
    485494    default:
    486495      return ("NONE");

  • trunk/psModules/src/camera/pmFPAfile.h

    r16841 r17036  
    44 * @author EAM, IfA
    55 *
    6  * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2008-03-06 20:47:50 $
     6 * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2008-03-18 18:38:14 $
    88 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    3636    PM_FPA_FILE_KAPA,
    3737    PM_FPA_FILE_HEADER,
    38     PM_FPA_FILE_ASTROM,
     38    PM_FPA_FILE_ASTROM_MODEL,
     39    PM_FPA_FILE_ASTROM_REFSTARS,
    3940} pmFPAfileType;
    4041

  • trunk/psModules/src/camera/pmFPAfileIO.c

    r17025 r17036  
    3434#include "pmResiduals.h"
    3535#include "pmPSF_IO.h"
    36 #include "pmAstrometryTable.h"
     36#include "pmAstrometryModel.h"
     37#include "pmAstrometryRefstars.h"
    3738#include "pmFPA_JPEG.h"
    3839#include "pmSourcePlots.h"
    … …  
    196197        status = pmPSFmodelReadForView (view, file, config);
    197198        break;
    198       case PM_FPA_FILE_ASTROM:
    199         status = pmAstromReadForView (view, file, config);
    200         break;
     199      case PM_FPA_FILE_ASTROM_MODEL:
     200        status = pmAstromModelReadForView (view, file, config);
     201        break;
     202      case PM_FPA_FILE_ASTROM_REFSTARS:
    201203      case PM_FPA_FILE_JPEG:
    202204      case PM_FPA_FILE_KAPA:
    … …  
    281283    case PM_FPA_FILE_CMF:
    282284    case PM_FPA_FILE_PSF:
    283     case PM_FPA_FILE_ASTROM:
     285    case PM_FPA_FILE_ASTROM_MODEL:
     286    case PM_FPA_FILE_ASTROM_REFSTARS:
    284287    case PM_FPA_FILE_JPEG:
    285288    case PM_FPA_FILE_KAPA:
    … …  
    357360      }
    358361    }
    359     if (file->type == PM_FPA_FILE_ASTROM) {
    360       if (!pmAstromCheckDataStatusForView (view, file)) {
     362    if (file->type == PM_FPA_FILE_ASTROM_MODEL) {
     363      if (!pmAstromModelCheckDataStatusForView (view, file)) {
     364        psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
     365        return true;
     366      }
     367    }
     368    if (file->type == PM_FPA_FILE_ASTROM_REFSTARS) {
     369      if (!pmAstromRefstarsCheckDataStatusForView (view, file)) {
    361370        psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
    362371        return true;
    … …  
    405414    fitsType |= (file->type == PM_FPA_FILE_CMF);
    406415    fitsType |= (file->type == PM_FPA_FILE_PSF);
    407     fitsType |= (file->type == PM_FPA_FILE_ASTROM);
     416    fitsType |= (file->type == PM_FPA_FILE_ASTROM_MODEL);
     417    fitsType |= (file->type == PM_FPA_FILE_ASTROM_REFSTARS);
    408418
    409419    // Ensure headers and all are updated
    … …  
    481491        break;
    482492
    483       case PM_FPA_FILE_ASTROM:
    484         status = pmAstromWriteForView (view, file, config);
     493      case PM_FPA_FILE_ASTROM_MODEL:
     494        status = pmAstromModelWriteForView (view, file, config);
     495        break;
     496
     497      case PM_FPA_FILE_ASTROM_REFSTARS:
     498        status = pmAstromRefstarsWriteForView (view, file, config);
    485499        break;
    486500
    … …  
    543557      case PM_FPA_FILE_CMF:
    544558      case PM_FPA_FILE_PSF:
    545       case PM_FPA_FILE_ASTROM:
     559      case PM_FPA_FILE_ASTROM_MODEL:
     560      case PM_FPA_FILE_ASTROM_REFSTARS:
    546561        psTrace ("psModules.camera", 5, "closing %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
    547562        status = psFitsClose (file->fits);
    … …  
    611626      case PM_FPA_FILE_CMF:
    612627      case PM_FPA_FILE_PSF:
    613       case PM_FPA_FILE_ASTROM:
     628      case PM_FPA_FILE_ASTROM_MODEL:
     629      case PM_FPA_FILE_ASTROM_REFSTARS:
    614630        psTrace ("psModules.camera", 5, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name);
    615631        return true;
    … …  
    749765      case PM_FPA_FILE_CMF:
    750766      case PM_FPA_FILE_PSF:
    751       case PM_FPA_FILE_ASTROM:
     767      case PM_FPA_FILE_ASTROM_MODEL:
     768      case PM_FPA_FILE_ASTROM_REFSTARS:
    752769        psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n",
    753770                 file->filename, file->name, view->chip, view->cell, view->readout);
    … …  
    922939        status = pmPSFmodelWritePHU (view, file, config);
    923940        break;
    924       case PM_FPA_FILE_ASTROM:
     941      case PM_FPA_FILE_ASTROM_REFSTARS:
     942        status = pmAstromRefstarsWritePHU (view, file, config);
     943        break;
     944      case PM_FPA_FILE_ASTROM_MODEL:
    925945      case PM_FPA_FILE_SX:
    926946      case PM_FPA_FILE_RAW:

  • trunk/psModules/src/psmodules.h

    r16841 r17036  
    7575#include <pmAstrometryRegions.h>
    7676#include <pmAstrometryObjects.h>
    77 #include <pmAstrometryTable.h>
     77#include <pmAstrometryModel.h>
     78#include <pmAstrometryRefstars.h>
    7879#include <pmAstrometryDistortion.h>
    7980

  • trunk/psModules/test/astrom/tap_pmAstrometryWCS.c

    r10875 r17036  
    5555
    5656        // make these tests double
    57         ok_float(fpa->toSky->R*PM_DEG_RAD, 0.0, "projection center RA %f", fpa->toSky->R*PM_DEG_RAD);
    58         ok_float(fpa->toSky->R*PM_DEG_RAD, 0.0, "projection center DEC %f", fpa->toSky->R*PM_DEG_RAD);
     57        ok_float(fpa->toSky->R*PS_DEG_RAD, 0.0, "projection center RA %f", fpa->toSky->R*PS_DEG_RAD);
     58        ok_float(fpa->toSky->R*PS_DEG_RAD, 0.0, "projection center DEC %f", fpa->toSky->R*PS_DEG_RAD);
    5959
    6060        ok_float(fpa->toSky->Xs, PM_RAD_DEG/3600.0/10.0, "projection X scale %f", fpa->toSky->Xs);
    … …  
    122122
    123123        // make these tests double
    124         ok_float(fpa->toSky->R*PM_DEG_RAD, 0.0, "projection center RA %f", fpa->toSky->R*PM_DEG_RAD);
    125         ok_float(fpa->toSky->R*PM_DEG_RAD, 0.0, "projection center DEC %f", fpa->toSky->R*PM_DEG_RAD);
     124        ok_float(fpa->toSky->R*PS_DEG_RAD, 0.0, "projection center RA %f", fpa->toSky->R*PS_DEG_RAD);
     125        ok_float(fpa->toSky->R*PS_DEG_RAD, 0.0, "projection center DEC %f", fpa->toSky->R*PS_DEG_RAD);
    126126
    127127        ok_float(fpa->toSky->Xs, PM_RAD_DEG/3600.0/10.0, "projection X scale %f", fpa->toSky->Xs);

  • trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO.c

    r15989 r17036  
    9898                sky2->r += 2*M_PI;
    9999
    100             ok_float(sky1->r*PM_DEG_RAD, sky2->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->r*PM_DEG_RAD, sky2->r*PM_DEG_RAD, sky1->r*PM_DEG_RAD - sky2->r*PM_DEG_RAD);
    101             ok_float(sky1->d*PM_DEG_RAD, sky2->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->d*PM_DEG_RAD, sky2->d*PM_DEG_RAD, sky1->d*PM_DEG_RAD - sky2->d*PM_DEG_RAD);
     100            ok_float(sky1->r*PS_DEG_RAD, sky2->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->r*PS_DEG_RAD, sky2->r*PS_DEG_RAD, sky1->r*PS_DEG_RAD - sky2->r*PS_DEG_RAD);
     101            ok_float(sky1->d*PS_DEG_RAD, sky2->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->d*PS_DEG_RAD, sky2->d*PS_DEG_RAD, sky1->d*PS_DEG_RAD - sky2->d*PS_DEG_RAD);
    102102        }
    103103    }
    … …  
    171171                sky2->r += 2*M_PI;
    172172
    173             ok_float(sky1->r*PM_DEG_RAD, sky2->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->r*PM_DEG_RAD, sky2->r*PM_DEG_RAD, sky1->r*PM_DEG_RAD - sky2->r*PM_DEG_RAD);
    174             ok_float(sky1->d*PM_DEG_RAD, sky2->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->d*PM_DEG_RAD, sky2->d*PM_DEG_RAD, sky1->d*PM_DEG_RAD - sky2->d*PM_DEG_RAD);
     173            ok_float(sky1->r*PS_DEG_RAD, sky2->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->r*PS_DEG_RAD, sky2->r*PS_DEG_RAD, sky1->r*PS_DEG_RAD - sky2->r*PS_DEG_RAD);
     174            ok_float(sky1->d*PS_DEG_RAD, sky2->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->d*PS_DEG_RAD, sky2->d*PS_DEG_RAD, sky1->d*PS_DEG_RAD - sky2->d*PS_DEG_RAD);
    175175        }
    176176    }
    … …  
    244244                sky2->r += 2*M_PI;
    245245
    246             ok_float(sky1->r*PM_DEG_RAD, sky2->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->r*PM_DEG_RAD, sky2->r*PM_DEG_RAD, sky1->r*PM_DEG_RAD - sky2->r*PM_DEG_RAD);
    247             ok_float(sky1->d*PM_DEG_RAD, sky2->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->d*PM_DEG_RAD, sky2->d*PM_DEG_RAD, sky2->d*PM_DEG_RAD - sky2->d*PM_DEG_RAD);
     246            ok_float(sky1->r*PS_DEG_RAD, sky2->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->r*PS_DEG_RAD, sky2->r*PS_DEG_RAD, sky1->r*PS_DEG_RAD - sky2->r*PS_DEG_RAD);
     247            ok_float(sky1->d*PS_DEG_RAD, sky2->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", sky1->d*PS_DEG_RAD, sky2->d*PS_DEG_RAD, sky2->d*PS_DEG_RAD - sky2->d*PS_DEG_RAD);
    248248        }
    249249    }
    … …  
    310310                sky->r += 2*M_PI;
    311311
    312             ok_float(rDVO, sky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, sky->r*PM_DEG_RAD, rDVO - sky->r*PM_DEG_RAD);
    313             ok_float(dDVO, sky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, sky->d*PM_DEG_RAD, dDVO - sky->d*PM_DEG_RAD);
     312            ok_float(rDVO, sky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, sky->r*PS_DEG_RAD, rDVO - sky->r*PS_DEG_RAD);
     313            ok_float(dDVO, sky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, sky->d*PS_DEG_RAD, dDVO - sky->d*PS_DEG_RAD);
    314314        }
    315315    }
    … …  
    369369                sky->r += 2*M_PI;
    370370
    371             ok_float(rDVO, sky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, sky->r*PM_DEG_RAD, rDVO - sky->r*PM_DEG_RAD);
    372             ok_float(dDVO, sky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, sky->d*PM_DEG_RAD, dDVO - sky->d*PM_DEG_RAD);
     371            ok_float(rDVO, sky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, sky->r*PS_DEG_RAD, rDVO - sky->r*PS_DEG_RAD);
     372            ok_float(dDVO, sky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, sky->d*PS_DEG_RAD, dDVO - sky->d*PS_DEG_RAD);
    373373        }
    374374    }
    … …  
    428428                sky->r += 2*M_PI;
    429429
    430             ok_float(rDVO, sky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, sky->r*PM_DEG_RAD, rDVO - sky->r*PM_DEG_RAD);
    431             ok_float(dDVO, sky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, sky->d*PM_DEG_RAD, dDVO - sky->d*PM_DEG_RAD);
     430            ok_float(rDVO, sky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, sky->r*PS_DEG_RAD, rDVO - sky->r*PS_DEG_RAD);
     431            ok_float(dDVO, sky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, sky->d*PS_DEG_RAD, dDVO - sky->d*PS_DEG_RAD);
    432432        }
    433433    }

  • trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO2.c

    r15989 r17036  
    9393                onSky->r += 2*M_PI;
    9494
    95             ok_float(rDVO, onSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PM_DEG_RAD, rDVO - onSky->r*PM_DEG_RAD);
    96             ok_float(dDVO, onSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PM_DEG_RAD, dDVO - onSky->d*PM_DEG_RAD);
     95            ok_float(rDVO, onSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PS_DEG_RAD, rDVO - onSky->r*PS_DEG_RAD);
     96            ok_float(dDVO, onSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PS_DEG_RAD, dDVO - onSky->d*PS_DEG_RAD);
    9797        }
    9898    }
    … …  
    164164                onSky->r += 2*M_PI;
    165165
    166             ok_float(rDVO, onSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PM_DEG_RAD, rDVO - onSky->r*PM_DEG_RAD);
    167             ok_float(dDVO, onSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PM_DEG_RAD, dDVO - onSky->d*PM_DEG_RAD);
     166            ok_float(rDVO, onSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PS_DEG_RAD, rDVO - onSky->r*PS_DEG_RAD);
     167            ok_float(dDVO, onSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PS_DEG_RAD, dDVO - onSky->d*PS_DEG_RAD);
    168168        }
    169169    }
    … …  
    238238                onSky->r += 2*M_PI;
    239239
    240             ok_float(rDVO, onSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PM_DEG_RAD, rDVO - onSky->r*PM_DEG_RAD);
    241             ok_float(dDVO, onSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PM_DEG_RAD, dDVO - onSky->d*PM_DEG_RAD);
     240            ok_float(rDVO, onSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PS_DEG_RAD, rDVO - onSky->r*PS_DEG_RAD);
     241            ok_float(dDVO, onSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PS_DEG_RAD, dDVO - onSky->d*PS_DEG_RAD);
    242242        }
    243243    }
    … …  
    309309                onSky->r += 2*M_PI;
    310310
    311             ok_float(rDVO, onSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PM_DEG_RAD, rDVO - onSky->r*PM_DEG_RAD);
    312             ok_float(dDVO, onSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PM_DEG_RAD, dDVO - onSky->d*PM_DEG_RAD);
     311            ok_float(rDVO, onSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PS_DEG_RAD, rDVO - onSky->r*PS_DEG_RAD);
     312            ok_float(dDVO, onSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PS_DEG_RAD, dDVO - onSky->d*PS_DEG_RAD);
    313313        }
    314314    }
    … …  
    380380                onSky->r += 2*M_PI;
    381381
    382             ok_float(rDVO, onSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PM_DEG_RAD, rDVO - onSky->r*PM_DEG_RAD);
    383             ok_float(dDVO, onSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PM_DEG_RAD, dDVO - onSky->d*PM_DEG_RAD);
     382            ok_float(rDVO, onSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PS_DEG_RAD, rDVO - onSky->r*PS_DEG_RAD);
     383            ok_float(dDVO, onSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PS_DEG_RAD, dDVO - onSky->d*PS_DEG_RAD);
    384384        }
    385385    }
    … …  
    454454                onSky->r += 2*M_PI;
    455455
    456             ok_float(rDVO, onSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PM_DEG_RAD, rDVO - onSky->r*PM_DEG_RAD);
    457             ok_float(dDVO, onSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PM_DEG_RAD, dDVO - onSky->d*PM_DEG_RAD);
     456            ok_float(rDVO, onSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", rDVO, onSky->r*PS_DEG_RAD, rDVO - onSky->r*PS_DEG_RAD);
     457            ok_float(dDVO, onSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", dDVO, onSky->d*PS_DEG_RAD, dDVO - onSky->d*PS_DEG_RAD);
    458458        }
    459459    }

  • trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO3.c

    r15989 r17036  
    104104                bSky->r += 2*M_PI;
    105105
    106             ok_float(aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, aSky->r*PM_DEG_RAD - bSky->r*PM_DEG_RAD);
    107             ok_float(aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, aSky->d*PM_DEG_RAD - bSky->d*PM_DEG_RAD);
     106            ok_float(aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, aSky->r*PS_DEG_RAD - bSky->r*PS_DEG_RAD);
     107            ok_float(aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, aSky->d*PS_DEG_RAD - bSky->d*PS_DEG_RAD);
    108108        }
    109109    }
    … …  
    196196                bSky->r += 2*M_PI;
    197197
    198             ok_float(aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, aSky->r*PM_DEG_RAD - bSky->r*PM_DEG_RAD);
    199             ok_float(aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, aSky->d*PM_DEG_RAD - bSky->d*PM_DEG_RAD);
     198            ok_float(aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, aSky->r*PS_DEG_RAD - bSky->r*PS_DEG_RAD);
     199            ok_float(aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, aSky->d*PS_DEG_RAD - bSky->d*PS_DEG_RAD);
    200200        }
    201201    }
    … …  
    289289                bSky->r += 2*M_PI;
    290290
    291             ok_float(aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, aSky->r*PM_DEG_RAD - bSky->r*PM_DEG_RAD);
    292             ok_float(aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, aSky->d*PM_DEG_RAD - bSky->d*PM_DEG_RAD);
     291            ok_float(aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, aSky->r*PS_DEG_RAD - bSky->r*PS_DEG_RAD);
     292            ok_float(aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, aSky->d*PS_DEG_RAD - bSky->d*PS_DEG_RAD);
    293293        }
    294294    }
    … …  
    379379                bSky->r += 2*M_PI;
    380380
    381             ok_float(aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, aSky->r*PM_DEG_RAD - bSky->r*PM_DEG_RAD);
    382             ok_float(aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, aSky->d*PM_DEG_RAD - bSky->d*PM_DEG_RAD);
     381            ok_float(aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, aSky->r*PS_DEG_RAD - bSky->r*PS_DEG_RAD);
     382            ok_float(aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, aSky->d*PS_DEG_RAD - bSky->d*PS_DEG_RAD);
    383383        }
    384384    }
    … …  
    471471                bSky->r += 2*M_PI;
    472472
    473             ok_float(aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, aSky->r*PM_DEG_RAD - bSky->r*PM_DEG_RAD);
    474             ok_float(aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, aSky->d*PM_DEG_RAD - bSky->d*PM_DEG_RAD);
     473            ok_float(aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, aSky->r*PS_DEG_RAD - bSky->r*PS_DEG_RAD);
     474            ok_float(aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, "coordinate match: %f vs %f (delta = %f)", aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, aSky->d*PS_DEG_RAD - bSky->d*PS_DEG_RAD);
    475475        }
    476476    }
    … …  
    566566            // XXX we are getting round-off errors as a result of the wcs transformation
    567567            // having terms in units of pix/degree. for now require 10mas on this
    568             ok_float_tol(aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, 0.01/3600.0, "coordinate match: %f vs %f (delta = %f)", aSky->r*PM_DEG_RAD, bSky->r*PM_DEG_RAD, aSky->r*PM_DEG_RAD - bSky->r*PM_DEG_RAD);
    569             ok_float_tol(aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, 0.01/3600.0, "coordinate match: %f vs %f (delta = %f)", aSky->d*PM_DEG_RAD, bSky->d*PM_DEG_RAD, aSky->d*PM_DEG_RAD - bSky->d*PM_DEG_RAD);
     568            ok_float_tol(aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, 0.01/3600.0, "coordinate match: %f vs %f (delta = %f)", aSky->r*PS_DEG_RAD, bSky->r*PS_DEG_RAD, aSky->r*PS_DEG_RAD - bSky->r*PS_DEG_RAD);
     569            ok_float_tol(aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, 0.01/3600.0, "coordinate match: %f vs %f (delta = %f)", aSky->d*PS_DEG_RAD, bSky->d*PS_DEG_RAD, aSky->d*PS_DEG_RAD - bSky->d*PS_DEG_RAD);
    570570        }
    571571    }

  • trunk/psModules/test/astrom/tap_pmAstrometryWCS_DVO4.c

    r15989 r17036  
    232232            // fprintf (stderr, "fpa y: %f vs %f : %f\n", dDVO, onFPA->y, dDVO - onFPA->y);
    233233
    234             ok_float(onSky->r*PM_DEG_RAD, rDVO, "coordinate match: %f vs %f (delta = %f)", onSky->r*PM_DEG_RAD, rDVO, 3600.0*(onSky->r*PM_DEG_RAD - rDVO));
    235             ok_float(onSky->d*PM_DEG_RAD, dDVO, "coordinate match: %f vs %f (delta = %f)", onSky->d*PM_DEG_RAD, dDVO, 3600.0*(onSky->d*PM_DEG_RAD - dDVO));
     234            ok_float(onSky->r*PS_DEG_RAD, rDVO, "coordinate match: %f vs %f (delta = %f)", onSky->r*PS_DEG_RAD, rDVO, 3600.0*(onSky->r*PS_DEG_RAD - rDVO));
     235            ok_float(onSky->d*PS_DEG_RAD, dDVO, "coordinate match: %f vs %f (delta = %f)", onSky->d*PS_DEG_RAD, dDVO, 3600.0*(onSky->d*PS_DEG_RAD - dDVO));
    236236        }
    237237    }
Note: See TracChangeset for help on using the changeset viewer.