IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 1, 2007, 12:00:37 PM (19 years ago)
Author:
jhoblitt
Message:

distcheck fixes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/test/detrend/tap_pmShutterCorrection.c

    r8926 r11550  
    1616    {
    1717        psMemId id = psMemGetId();
    18         pmShutterCorrPars *pars = pmShutterCorrParsAlloc ();
     18        pmShutterCorrection *pars = pmShutterCorrectionAlloc ();
    1919
    2020        ok(pars != NULL, "pmShutterCorrPars successfully allocated");
    … …  
    4444        }
    4545
    46         pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
     46        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
    4747
    4848        ok(pars != NULL, "pmShutterCorrPars successfully allocated");
    … …  
    8181        }
    8282
    83         pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
    84 
    85         ok(pars != NULL, "pmShutterCorrPars successfully allocated");
    86         skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
     83        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
     84
     85        ok(pars != NULL, "pmShutterCorrection successfully allocated");
     86        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
    8787
    8888        // with fine linearly-spaced times large compared to TO and TK,
    … …  
    118118        }
    119119
    120         pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
    121 
    122         // with fine log-spaced times well-sampling TO and TK,
    123         // we can expect accurate guesses
    124         ok(pars != NULL, "pmShutterCorrPars successfully allocated");
    125         skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
     120        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
     121
     122        // with fine log-spaced times well-sampling TO and TK,
     123        // we can expect accurate guesses
     124        ok(pars != NULL, "pmShutterCorrectionsuccessfully allocated");
     125        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
    126126        ok(fabs(pars->scale  - AK) < 0.01, "scale guess is close enough (got %f vs %f)",  pars->scale, AK);
    127127        ok(fabs(pars->offset - TK) < 0.01, "offset guess is close enough (got %f vs %f)", pars->offset, TK);
    … …  
    154154        }
    155155
    156         pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
    157 
    158         ok(pars != NULL, "pmShutterCorrPars successfully allocated");
    159         skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
     156        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
     157
     158        ok(pars != NULL, "pmShutterCorrection successfully allocated");
     159        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
    160160
    161161        // with coarse linearly-spaced times large compared to TO and TK,
    … …  
    191191        }
    192192
    193         pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
    194 
    195         ok(pars != NULL, "pmShutterCorrPars successfully allocated");
    196         skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
     193        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
     194
     195        ok(pars != NULL, "pmShutterCorrection successfully allocated");
     196        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionsAlloc() failed");
    197197
    198198        // with fine linearly-spaced times large compared to TO and TK,
    … …  
    228228        }
    229229
    230         pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
    231 
    232         // with fine log-spaced times well-sampling TO and TK,
    233         // we can expect accurate guesses
    234         ok(pars != NULL, "pmShutterCorrPars successfully allocated");
    235         skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
     230        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
     231
     232        // with fine log-spaced times well-sampling TO and TK,
     233        // we can expect accurate guesses
     234        ok(pars != NULL, "pmShutterCorrection successfully allocated");
     235        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
    236236        ok(fabs(pars->scale  - AK) < 0.01, "scale guess is close enough (got %f vs %f)",  pars->scale, AK);
    237237        ok(fabs(pars->offset - TK) < 0.01, "offset guess is close enough (got %f vs %f)", pars->offset, TK);
    … …  
    266266        }
    267267
    268         pmShutterCorrPars *guess = pmShutterCorrectionGuess (exptime, counts);
     268        pmShutterCorrection *guess = pmShutterCorrectionGuess (exptime, counts);
    269269        skip_start(guess == NULL, 0, "Skipping tests because pmShutterCorrectionGuess() failed");
    270         pmShutterCorrPars *pars = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
    271 
    272         // with fine log-spaced times well-sampling TO and TK,
    273         // we can expect accurate guesses
    274         ok(pars != NULL, "pmShutterCorrPars successfully allocated by FullFit");
    275         skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
     270        pmShutterCorrection *pars = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
     271
     272        // with fine log-spaced times well-sampling TO and TK,
     273        // we can expect accurate guesses
     274        ok(pars != NULL, "pmShutterCorrection successfully allocated by FullFit");
     275        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionsAlloc() failed");
    276276        ok(fabs(pars->scale  - AK) < 0.01, "scale fit is close enough (got %f vs %f)",  pars->scale, AK);
    277277        ok(fabs(pars->offset - TK) < 0.01, "offset fit is close enough (got %f vs %f)", pars->offset, TK);
    … …  
    310310        }
    311311
    312         pmShutterCorrPars *guess = pmShutterCorrectionGuess (exptime, counts);
     312        pmShutterCorrection*guess = pmShutterCorrectionGuess (exptime, counts);
    313313        skip_start(guess == NULL, 0, "Skipping tests because pmShutterCorrectionGuess() failed");
    314         pmShutterCorrPars *pars = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
    315 
    316         // with fine log-spaced times well-sampling TO and TK,
    317         // we can expect accurate guesses
    318         ok(pars != NULL, "pmShutterCorrPars successfully allocated by FullFit");
    319         skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
     314        pmShutterCorrection *pars = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
     315
     316        // with fine log-spaced times well-sampling TO and TK,
     317        // we can expect accurate guesses
     318        ok(pars != NULL, "pmShutterCorrection successfully allocated by FullFit");
     319        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
    320320        ok(fabs(pars->scale  - AK) < 0.01, "scale fit is close enough (got %f vs %f)",  pars->scale, AK);
    321321        ok(fabs(pars->offset - TK) < 0.01, "offset fit is close enough (got %f vs %f)", pars->offset, TK);
    … …  
    356356        }
    357357
    358         pmShutterCorrPars *guess = pmShutterCorrectionGuess (exptime, counts);
     358        pmShutterCorrection*guess = pmShutterCorrectionGuess (exptime, counts);
    359359        skip_start(guess == NULL, 0, "Skipping tests because pmShutterCorrectionGuess() failed");
    360         pmShutterCorrPars *full = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
    361         pmShutterCorrPars *pars = pmShutterCorrectionLinFit (exptime, counts, cntErr, full->offref);
    362 
    363         // with fine log-spaced times well-sampling TO and TK,
    364         // we can expect accurate guesses
    365         ok(pars != NULL, "pmShutterCorrPars successfully allocated by FullFit");
    366         skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
     360        pmShutterCorrection *full = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
     361        pmShutterCorrection *pars = pmShutterCorrectionLinFit (exptime, counts, cntErr, NULL, full->offref, 1, 5, 0);
     362
     363        // with fine log-spaced times well-sampling TO and TK,
     364        // we can expect accurate guesses
     365        ok(pars != NULL, "pmShutterCorrection successfully allocated by FullFit");
     366        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
    367367        ok(fabs(pars->scale  - AK) < 0.01, "scale fit is close enough (got %f vs %f)",  pars->scale, AK);
    368368        ok(fabs(pars->offset - TK) < 0.01, "offset fit is close enough (got %f vs %f)", pars->offset, TK);
    … …  
    402402        }
    403403
    404         pmShutterCorrPars *guess = pmShutterCorrectionGuess (exptime, counts);
     404        pmShutterCorrection *guess = pmShutterCorrectionGuess (exptime, counts);
    405405        skip_start(guess == NULL, 0, "Skipping tests because pmShutterCorrectionGuess() failed");
    406         pmShutterCorrPars *full = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
    407         pmShutterCorrPars *pars = pmShutterCorrectionLinFit (exptime, counts, cntErr, full->offref);
    408 
    409         // with fine log-spaced times well-sampling TO and TK,
    410         // we can expect accurate guesses
    411         ok(pars != NULL, "pmShutterCorrPars successfully allocated by FullFit");
    412         skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
     406        pmShutterCorrection *full = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
     407        pmShutterCorrection *pars = pmShutterCorrectionLinFit (exptime, counts, cntErr, NULL, full->offref, 1, 5, 0);
     408
     409        // with fine log-spaced times well-sampling TO and TK,
     410        // we can expect accurate guesses
     411        ok(pars != NULL, "pmShutterCorrection successfully allocated by FullFit");
     412        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
    413413        ok(fabs(pars->scale  - AK) < 0.01, "scale fit is close enough (got %f vs %f)",  pars->scale, AK);
    414414        ok(fabs(pars->offset - TK) < 0.01, "offset fit is close enough (got %f vs %f)", pars->offset, TK);
Note: See TracChangeset for help on using the changeset viewer.