IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 14435


Ignore:
Timestamp:
Aug 8, 2007, 11:00:31 AM (19 years ago)
Author:
Paul Price
Message:

Adding skewness and kurtosis and fringe residual (previously stored under 'user') statistics for residual images.

Location:
trunk/ippTools/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/dettool.c

    r14271 r14435  
    49084908        return false;
    49094909    }
     4910    psF64 bg_skewness = psMetadataLookupF64(&status, config->args, "-bg_skewness");
     4911    if (!status) {
     4912        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_skewness");
     4913        return false;
     4914    }
     4915    psF64 bg_kurtosis = psMetadataLookupF64(&status, config->args, "-bg_kurtosis");
     4916    if (!status) {
     4917        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_kurtosis");
     4918        return false;
     4919    }
    49104920    psF64 bin_stdev = psMetadataLookupF64(&status, config->args, "-bin_stdev");
    49114921    if (!status) {
    … …  
    49354945    if (!status) {
    49364946        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_2");
     4947        return false;
     4948    }
     4949
     4950    psF64 fringe_resid_0 = psMetadataLookupF64(&status, config->args, "-fringe_resid_0");
     4951    if (!status) {
     4952        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_resid_0");
     4953        return false;
     4954    }
     4955    psF64 fringe_resid_1 = psMetadataLookupF64(&status, config->args, "-fringe_resid_1");
     4956    if (!status) {
     4957        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_resid_1");
     4958        return false;
     4959    }
     4960    psF64 fringe_resid_2 = psMetadataLookupF64(&status, config->args, "-fringe_resid_2");
     4961    if (!status) {
     4962        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_resid_2");
    49374963        return false;
    49384964    }
    … …  
    49825008            bg_stdev,
    49835009            bg_mean_stdev,
     5010            bg_skewness,
     5011            bg_kurtosis,
    49845012            bin_stdev,
    49855013            fringe_0,
    49865014            fringe_1,
    49875015            fringe_2,
     5016            fringe_resid_0,
     5017            fringe_resid_1,
     5018            fringe_resid_2,
    49885019            user_1,
    49895020            user_2,
    … …  
    54295460        return false;
    54305461    }
     5462    psF64 bg_skewness = psMetadataLookupF64(&status, config->args, "-bg_skewness");
     5463    if (!status) {
     5464        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_skewness");
     5465        return false;
     5466    }
     5467    psF64 bg_kurtosis = psMetadataLookupF64(&status, config->args, "-bg_kurtosis");
     5468    if (!status) {
     5469        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_kurtosis");
     5470        return false;
     5471    }
    54315472    psF64 bin_stdev = psMetadataLookupF64(&status, config->args, "-bin_stdev");
    54325473    if (!status) {
    … …  
    54485489    if (!status) {
    54495490        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_2");
     5491        return false;
     5492    }
     5493
     5494    psF64 fringe_resid_0 = psMetadataLookupF64(&status, config->args, "-fringe_resid_0");
     5495    if (!status) {
     5496        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_resid_0");
     5497        return false;
     5498    }
     5499    psF64 fringe_resid_1 = psMetadataLookupF64(&status, config->args, "-fringe_resid_1");
     5500    if (!status) {
     5501        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_resid_1");
     5502        return false;
     5503    }
     5504    psF64 fringe_resid_2 = psMetadataLookupF64(&status, config->args, "-fringe_resid_2");
     5505    if (!status) {
     5506        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_resid_2");
    54505507        return false;
    54515508    }
    … …  
    55095566            bg_stdev,
    55105567            bg_mean_stdev,
     5568            bg_skewness,
     5569            bg_kurtosis,
    55115570            bin_stdev,
    55125571            fringe_0,
    55135572            fringe_1,
    55145573            fringe_2,
     5574            fringe_resid_0,
     5575            fringe_resid_1,
     5576            fringe_resid_2,
    55155577            user_1,
    55165578            user_2,
    … …  
    58975959        return false;
    58985960    }
    5899    
     5961
    59005962    // optional
    59015963    bool again = psMetadataLookupBool(&status, config->args, "-again");

  • trunk/ippTools/src/dettoolConfig.c

    r14271 r14435  
    738738    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
    739739            "define exposure background mean stdev", NAN);
     740    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_skewness",  0,
     741            "define exposure background skewness", NAN);
     742    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_kurtosis",  0,
     743            "define exposure background kurtosis", NAN);
    740744    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bin_stdev",  0,
    741745            "define exposure background binned stdev", NAN);
    … …  
    746750    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_2",  0,
    747751            "define fringe slope (2nd term)", NAN);
     752    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_0",  0,
     753            "define fringe residual (0th term)", NAN);
     754    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_1",  0,
     755            "define fringe residual (1st term)", NAN);
     756    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_2",  0,
     757            "define fringe residual (2nd term)", NAN);
    748758    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-user_1",  0,
    749759            "define user statistic (1)", NAN);
    … …  
    811821    psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
    812822            "define exposure background mean stdev", NAN);
     823    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_skewness",  0,
     824            "define exposure background skewness", NAN);
     825    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-bg_kurtosis",  0,
     826            "define exposure background kurtosis", NAN);
    813827    psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-bin_stdev",  0,
    814828            "define exposure background binned stdev", NAN);
    … …  
    819833    psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-fringe_2",  0,
    820834            "define fringe slope (2nd term)", NAN);
     835    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_0",  0,
     836            "define fringe residual (0th term)", NAN);
     837    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_1",  0,
     838            "define fringe residual (1st term)", NAN);
     839    psMetadataAddF64(addresidimfileArgs, PS_LIST_TAIL, "-fringe_resid_2",  0,
     840            "define fringe residual (2nd term)", NAN);
    821841    psMetadataAddF64(addresidexpArgs, PS_LIST_TAIL, "-user_1",  0,
    822842            "define user statistic (1)", NAN);
    … …  
    918938            "search for detrend ID", NULL);
    919939    psMetadataAddU64(detrunsummaryArgs, PS_LIST_TAIL, "-limit",  0,
    920                      "limit result set to N items", 0);
     940                     "limit result set to N items", 0);
    921941    psMetadataAddS32(detrunsummaryArgs, PS_LIST_TAIL, "-iteration",  0,
    922942            "search for iteration number", 0);
Note: See TracChangeset for help on using the changeset viewer.