IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10824


Ignore:
Timestamp:
Dec 22, 2006, 11:22:28 AM (19 years ago)
Author:
magnier
Message:

added new tests for bilevel astrometry terms

Location:
trunk/psModules/test/astrom
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/test/astrom

    • Property svn:ignore

      •  

        old new  
        77tst_pmAstrometry01
        88tap_pmAstrometryWCS
         9tap_pmAstrometryWCS_DVO
        910tap_pmAstrometryWCS_DVO2
        1011tap_pmAstrometryWCS_DVO3
        11 tap_pmAstrometryWCS_DVO
         12tap_pmAstrometryWCS_DVO4

  • trunk/psModules/test/astrom/.cvsignore

    r10786 r10824  
    77tst_pmAstrometry01
    88tap_pmAstrometryWCS
     9tap_pmAstrometryWCS_DVO
    910tap_pmAstrometryWCS_DVO2
    1011tap_pmAstrometryWCS_DVO3
    11 tap_pmAstrometryWCS_DVO
     12tap_pmAstrometryWCS_DVO4

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

    r10786 r10824  
    1515        tap_pmAstrometryWCS_DVO \
    1616        tap_pmAstrometryWCS_DVO2 \
    17         tap_pmAstrometryWCS_DVO3
     17        tap_pmAstrometryWCS_DVO3 \
     18        tap_pmAstrometryWCS_DVO4
    1819
    1920test: check

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

    r10786 r10824  
    4848        // toFPA carries pixel scale (pixels per micron)
    4949        // toTPA carries plate scale (microns per arcsecond)
    50         bool status = pmAstromReadWCS (fpa, chip, header, 25.0*PM_RAD_DEG/3600.0, false);
     50        bool status = pmAstromReadWCS (fpa, chip, header, 25.0*PM_RAD_DEG/3600.0);
    5151        ok (status, "converted WCS keywords to FPA astrometry");
    5252        skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
    … …  
    6161        ok_float(fpa->toSky->Ys, 25.0*PM_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Ys);
    6262
    63         ok_float(fpa->toTPA->x->coeff[1][0][0][0], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0][0][0]);
    64         ok_float(fpa->toTPA->y->coeff[0][1][0][0], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0][0][0]);
     63        ok_float(fpa->toTPA->x->coeff[1][0], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0]);
     64        ok_float(fpa->toTPA->y->coeff[0][1], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0]);
    6565
    6666        ok_float(chip->toFPA->x->coeff[0][0], 0.0, "ref pixel X: %f", chip->toFPA->x->coeff[0][0]);
    … …  
    115115        // toFPA carries pixel scale (pixels per micron)
    116116        // toTPA carries plate scale (microns per arcsecond)
    117         bool status = pmAstromReadWCS (fpa, chip, header, 25.0*PM_RAD_DEG/3600.0, false);
     117        bool status = pmAstromReadWCS (fpa, chip, header, 25.0*PM_RAD_DEG/3600.0);
    118118        ok (status, "converted WCS keywords to FPA astrometry");
    119119        skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
    … …  
    128128        ok_float(fpa->toSky->Ys, 25.0*PM_RAD_DEG/3600.0, "projection X scale %f", fpa->toSky->Ys);
    129129
    130         ok_float(fpa->toTPA->x->coeff[1][0][0][0], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0][0][0]);
    131         ok_float(fpa->toTPA->y->coeff[0][1][0][0], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0][0][0]);
     130        ok_float(fpa->toTPA->x->coeff[1][0], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0]);
     131        ok_float(fpa->toTPA->y->coeff[0][1], 0.04, "TP scale (mm per pixel): %f", fpa->toTPA->x->coeff[1][0]);
    132132
    133133        ok_float(chip->toFPA->x->coeff[0][0], -10.0, "ref pixel X: %f", chip->toFPA->x->coeff[0][0]);

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

    r10786 r10824  
    149149    pmAstromWCS *wcs2 = pmAstromWCSfromHeader(header2);
    150150
    151     psMetadataConfigWrite (header1, "head1.md");
    152     psMetadataConfigWrite (header2, "head2.md");
    153 
    154151    ok (wcs2 != NULL, "converted WCS keywords to WCS astrometry");
    155152    skip_start (wcs2 == NULL, 1, "*** WCS Conversion FAILS *** : skipping related tests");

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

    r10786 r10824  
    6767    pmChip *chip = pmChipAlloc (fpa, NULL);
    6868
    69     bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0, false);
     69    bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0);
    7070    ok (status, "converted WCS keywords to WCS astrometry");
    7171    skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
    … …  
    8585
    8686            psPlaneTransformApply (onFPA, chip->toFPA, onChip);
    87             psPlaneDistortApply (onTPA, fpa->toTPA, onFPA, 0.0, 0.0);
     87            psPlaneTransformApply (onTPA, fpa->toTPA, onFPA);
    8888            psDeproject (onSky, onTPA, fpa->toSky);
    8989
    … …  
    138138    pmChip *chip = pmChipAlloc (fpa, NULL);
    139139
    140     bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0, false);
     140    bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0);
    141141    ok (status, "converted WCS keywords to WCS astrometry");
    142142    skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
    … …  
    156156
    157157            psPlaneTransformApply (onFPA, chip->toFPA, onChip);
    158             psPlaneDistortApply (onTPA, fpa->toTPA, onFPA, 0.0, 0.0);
     158            psPlaneTransformApply (onTPA, fpa->toTPA, onFPA);
    159159            psDeproject (onSky, onTPA, fpa->toSky);
    160160
    … …  
    212212    pmChip *chip = pmChipAlloc (fpa, NULL);
    213213
    214     bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0, false);
     214    bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0);
    215215    ok (status, "converted WCS keywords to WCS astrometry");
    216216    skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
    … …  
    230230
    231231            psPlaneTransformApply (onFPA, chip->toFPA, onChip);
    232             psPlaneDistortApply (onTPA, fpa->toTPA, onFPA, 0.0, 0.0);
     232            psPlaneTransformApply (onTPA, fpa->toTPA, onFPA);
    233233            psDeproject (onSky, onTPA, fpa->toSky);
    234234
    … …  
    283283    pmChip *chip = pmChipAlloc (fpa, NULL);
    284284
    285     bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0, false);
     285    bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0);
    286286    ok (status, "converted WCS keywords to WCS astrometry");
    287287    skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
    … …  
    301301
    302302            psPlaneTransformApply (onFPA, chip->toFPA, onChip);
    303             psPlaneDistortApply (onTPA, fpa->toTPA, onFPA, 0.0, 0.0);
     303            psPlaneTransformApply (onTPA, fpa->toTPA, onFPA);
    304304            psDeproject (onSky, onTPA, fpa->toSky);
    305305
    … …  
    354354    pmChip *chip = pmChipAlloc (fpa, NULL);
    355355
    356     bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0, false);
     356    bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0);
    357357    ok (status, "converted WCS keywords to WCS astrometry");
    358358    skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
    … …  
    372372
    373373            psPlaneTransformApply (onFPA, chip->toFPA, onChip);
    374             psPlaneDistortApply (onTPA, fpa->toTPA, onFPA, 0.0, 0.0);
     374            psPlaneTransformApply (onTPA, fpa->toTPA, onFPA);
    375375            psDeproject (onSky, onTPA, fpa->toSky);
    376376
    … …  
    428428    pmChip *chip = pmChipAlloc (fpa, NULL);
    429429
    430     bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0, false);
     430    bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0);
    431431    ok (status, "converted WCS keywords to WCS astrometry");
    432432    skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
    … …  
    446446
    447447            psPlaneTransformApply (onFPA, chip->toFPA, onChip);
    448             psPlaneDistortApply (onTPA, fpa->toTPA, onFPA, 0.0, 0.0);
     448            psPlaneTransformApply (onTPA, fpa->toTPA, onFPA);
    449449            psDeproject (onSky, onTPA, fpa->toSky);
    450450
    … …  
    505505    pmChip *chip = pmChipAlloc (fpa, NULL);
    506506
    507     bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0, false);
     507    bool status = pmAstromReadWCS (fpa, chip, header, PM_RAD_DEG*10.0/3600.0);
    508508    ok (status, "converted WCS keywords to WCS astrometry");
    509509    skip_start (!status, 1, "*** WCS Conversion FAILS *** : skipping related tests");
    … …  
    524524
    525525            psPlaneTransformApply (aFPA, chip->toFPA, aChip);
    526             psPlaneDistortApply (aTPA, fpa->toTPA, aFPA, 0.0, 0.0);
     526            psPlaneTransformApply (aTPA, fpa->toTPA, aFPA);
    527527            psDeproject (onSky, aTPA, fpa->toSky);
    528528
    … …  
    533533
    534534            psProject (bTPA, onSky, fpa->toSky);
    535             psPlaneDistortApply (bFPA, fpa->fromTPA, bTPA, 0.0, 0.0);
     535            psPlaneTransformApply (bFPA, fpa->fromTPA, bTPA);
    536536            psPlaneTransformApply (bChip, chip->fromFPA, bFPA);
    537537

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

    r10786 r10824  
    6565    pmChip *chip = pmChipAlloc (fpa, NULL);
    6666
    67     bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0, false);
     67    bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0);
    6868
    6969    ok (status, "converted WCS keywords to WCS astrometry");
    … …  
    9090
    9191            psPlaneTransformApply (aFPA, chip->toFPA, aChip);
    92             psPlaneDistortApply (aTPA, fpa->toTPA, aFPA, 0.0, 0.0);
     92            psPlaneTransformApply (aTPA, fpa->toTPA, aFPA);
    9393            psDeproject (aSky, aTPA, fpa->toSky);
    9494
    … …  
    152152
    153153    psMetadata *header1 = WriteCoordsToHeader (&coords);
    154     psMetadataConfigWrite (header1, "head1.md");
    155154
    156155    pmFPA *fpa = pmFPAAlloc (NULL);
    157156    pmChip *chip = pmChipAlloc (fpa, NULL);
    158157
    159     bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0, false);
     158    bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0);
    160159
    161160    ok (status, "converted WCS keywords to WCS astrometry");
    … …  
    164163    psMetadata *header2 = psMetadataAlloc();
    165164    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
    166     psMetadataConfigWrite (header2, "head2.md");
    167165
    168166    pmAstromWCS *wcs = pmAstromWCSfromHeader(header2);
    … …  
    184182
    185183            psPlaneTransformApply (aFPA, chip->toFPA, aChip);
    186             psPlaneDistortApply (aTPA, fpa->toTPA, aFPA, 0.0, 0.0);
     184            psPlaneTransformApply (aTPA, fpa->toTPA, aFPA);
    187185            psDeproject (aSky, aTPA, fpa->toSky);
    188186
    … …  
    251249    pmChip *chip = pmChipAlloc (fpa, NULL);
    252250
    253     bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0, false);
    254     psMetadataConfigWrite (header1, "head1.md");
     251    bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0);
    255252
    256253    ok (status, "converted WCS keywords to WCS astrometry");
    … …  
    259256    psMetadata *header2 = psMetadataAlloc();
    260257    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
    261     psMetadataConfigWrite (header2, "head2.md");
    262258
    263259    pmAstromWCS *wcs = pmAstromWCSfromHeader(header2);
    … …  
    279275
    280276            psPlaneTransformApply (aFPA, chip->toFPA, aChip);
    281             psPlaneDistortApply (aTPA, fpa->toTPA, aFPA, 0.0, 0.0);
     277            psPlaneTransformApply (aTPA, fpa->toTPA, aFPA);
    282278            psDeproject (aSky, aTPA, fpa->toSky);
    283279
    … …  
    344340    pmChip *chip = pmChipAlloc (fpa, NULL);
    345341
    346     bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0, false);
     342    bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0);
    347343
    348344    ok (status, "converted WCS keywords to WCS astrometry");
    … …  
    369365
    370366            psPlaneTransformApply (aFPA, chip->toFPA, aChip);
    371             psPlaneDistortApply (aTPA, fpa->toTPA, aFPA, 0.0, 0.0);
     367            psPlaneTransformApply (aTPA, fpa->toTPA, aFPA);
    372368            psDeproject (aSky, aTPA, fpa->toSky);
    373369
    … …  
    431427
    432428    psMetadata *header1 = WriteCoordsToHeader (&coords);
    433     psMetadataConfigWrite (header1, "head1.md");
    434429
    435430    pmFPA *fpa = pmFPAAlloc (NULL);
    436431    pmChip *chip = pmChipAlloc (fpa, NULL);
    437432
    438     bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0, false);
     433    bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0);
    439434
    440435    ok (status, "converted WCS keywords to WCS astrometry");
    … …  
    443438    psMetadata *header2 = psMetadataAlloc();
    444439    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
    445     psMetadataConfigWrite (header2, "head2.md");
    446440
    447441    pmAstromWCS *wcs = pmAstromWCSfromHeader(header2);
    … …  
    463457
    464458            psPlaneTransformApply (aFPA, chip->toFPA, aChip);
    465             psPlaneDistortApply (aTPA, fpa->toTPA, aFPA, 0.0, 0.0);
     459            psPlaneTransformApply (aTPA, fpa->toTPA, aFPA);
    466460            psDeproject (aSky, aTPA, fpa->toSky);
    467461
    … …  
    530524    pmChip *chip = pmChipAlloc (fpa, NULL);
    531525
    532     bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0, false);
    533     psMetadataConfigWrite (header1, "head1.md");
     526    bool status = pmAstromReadWCS (fpa, chip, header1, PM_RAD_DEG*10.0/3600.0);
    534527
    535528    ok (status, "converted WCS keywords to WCS astrometry");
    … …  
    538531    psMetadata *header2 = psMetadataAlloc();
    539532    status = pmAstromWriteWCS (header2, fpa, chip, 0.001);
    540     psMetadataConfigWrite (header2, "head2.md");
    541533
    542534    pmAstromWCS *wcs = pmAstromWCSfromHeader(header2);
    … …  
    558550
    559551            psPlaneTransformApply (aFPA, chip->toFPA, aChip);
    560             psPlaneDistortApply (aTPA, fpa->toTPA, aFPA, 0.0, 0.0);
     552            psPlaneTransformApply (aTPA, fpa->toTPA, aFPA);
    561553            psDeproject (aSky, aTPA, fpa->toSky);
    562554
Note: See TracChangeset for help on using the changeset viewer.