IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 13649 for trunk/ippTools/src


Ignore:
Timestamp:
Jun 5, 2007, 11:55:11 AM (19 years ago)
Author:
eugene
Message:

added various chip and camera level metadata fields (bias stdev, ap resid, etc)

Location:
trunk/ippTools/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/camtool.c

    r13633 r13649  
    483483    }
    484484
    485     psS32 nastro = psMetadataLookupS32(&status, config->args, "-nastro");
    486     if (!status) {
    487         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -nastro");
    488         return false;
    489     }
    490     if (nastro < 0) {
    491         psError(PS_ERR_UNKNOWN, true, "-nastro is required");
    492         return false;
    493     }
    494 
    495485    psF32 zp_mean = psMetadataLookupF32(&status, config->args, "-zp_mean");
    496486    if (!status) {
    … …  
    510500    if (isnan(zp_stdev)) {
    511501        psError(PS_ERR_UNKNOWN, true, "-zp_stdev is required");
     502        return false;
     503    }
     504
     505    psF32 fwhm = psMetadataLookupF32(&status, config->args, "-fwhm");
     506    if (!status) {
     507        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm");
     508        return false;
     509    }
     510    if (isnan(fwhm)) {
     511        psError(PS_ERR_UNKNOWN, true, "-fwhm is required");
     512        return false;
     513    }
     514
     515    psF32 fwhm_range = psMetadataLookupF32(&status, config->args, "-fwhm_range");
     516    if (!status) {
     517        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm_range");
     518        return false;
     519    }
     520    if (isnan(fwhm_range)) {
     521        psError(PS_ERR_UNKNOWN, true, "-fwhm_range is required");
     522        return false;
     523    }
     524
     525    psS32 n_stars = psMetadataLookupS32(&status, config->args, "-n_stars");
     526    if (!status) {
     527        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_stars");
     528        return false;
     529    }
     530    if (n_stars < 0) {
     531        psError(PS_ERR_UNKNOWN, true, "-n_stars is required");
     532        return false;
     533    }
     534
     535    psS32 n_extended = psMetadataLookupS32(&status, config->args, "-n_extended");
     536    if (!status) {
     537        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_extended");
     538        return false;
     539    }
     540    if (n_extended < 0) {
     541        psError(PS_ERR_UNKNOWN, true, "-n_extended is required");
     542        return false;
     543    }
     544
     545    psS32 n_cr = psMetadataLookupS32(&status, config->args, "-n_cr");
     546    if (!status) {
     547        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_cr");
     548        return false;
     549    }
     550    if (n_cr < 0) {
     551        psError(PS_ERR_UNKNOWN, true, "-n_cr is required");
     552        return false;
     553    }
     554
     555    psS32 n_astrom = psMetadataLookupS32(&status, config->args, "-n_astrom");
     556    if (!status) {
     557        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_astrom");
     558        return false;
     559    }
     560    if (n_astrom < 0) {
     561        psError(PS_ERR_UNKNOWN, true, "-n_astrom is required");
    512562        return false;
    513563    }
    … …  
    576626        sigma_ra,
    577627        sigma_dec,
    578         nastro,
    579         path_base,
    580628        zp_mean,
    581629        zp_stdev,
     630        fwhm,
     631        fwhm_range,
     632        n_stars,
     633        n_extended,
     634        n_cr,
     635        n_astrom,
     636        path_base,
    582637        code
    583638    );

  • trunk/ippTools/src/camtoolConfig.c

    r13633 r13649  
    7777            "search by exposure time", NAN);
    7878    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg",  0,
    79             "search by exposue background", NAN);
     79            "search by exposure background", NAN);
    8080    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev",  0,
    81             "search by exposue background stdev", NAN);
     81            "search by exposure background stdev", NAN);
    8282    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
    83             "search by exposue background mean stdev", NAN);
     83            "search by exposure background mean stdev", NAN);
    8484    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt",  0,
    8585            "search by altitute", NAN);
    … …  
    136136            "define URI (required)", NULL);
    137137    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0,
    138             "define exposue background", NAN);
     138            "define exposure background", NAN);
    139139    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0,
    140             "define exposue background stdev", NAN);
     140            "define exposure background stdev", NAN);
    141141    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0,
    142             "define exposue background mean stdev", NAN);
     142            "define exposure background mean stdev", NAN);
    143143    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_ra", 0,
    144144            "define exposure E ra (required)", NAN);
    145145    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_dec", 0,
    146146            "define exposure E dec (required)", NAN);
    147     psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-nastro", 0,
    148             "define number of objects (required)", -1);
    149147    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_mean", 0,
    150148            "define zero point mean (required)", NAN);
    151149    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-zp_stdev", 0,
    152150            "define zero point stdev (required)", NAN);
     151    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fwhm", 0,
     152            "define FWHM in arcsec (required)", NAN);
     153    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-fhwm_range", 0,
     154            "define FWHM range in arcsec (required)", NAN);
     155    psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_stars", 0,
     156            "define number of stars (required)", -1);
     157    psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_extended", 0,
     158            "define number of extended objects (required)", -1);
     159    psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_cr", 0,
     160            "define number of cosmic rays (required)", -1);
     161    psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-n_astrom", 0,
     162            "define number of astrometry reference objects (required)", -1);
    153163    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0,
    154164            "define banana 1", NULL);

  • trunk/ippTools/src/chiptool.c

    r13580 r13649  
    145145    ADDPARAMF(config->args, where, F32, "decl");
    146146    ADDPARAMF(config->args, where, F32, "exp_time");
    147     ADDPARAMF(config->args, where, F64, "bg");
    148     ADDPARAMF(config->args, where, F64, "bg_stdev");
    149     ADDPARAMF(config->args, where, F64, "bg_mean_stdev");
     147    ADDPARAMF(config->args, where, F32, "bg");
     148    ADDPARAMF(config->args, where, F32, "bg_stdev");
     149    ADDPARAMF(config->args, where, F32, "bg_mean_stdev");
    150150    ADDPARAMF(config->args, where, F64, "alt");
    151151    ADDPARAMF(config->args, where, F64, "az");
    … …  
    838838    }
    839839
    840     psF64 bg = psMetadataLookupF64(&status, config->args, "-bg");
     840    psF32 bg = psMetadataLookupF32(&status, config->args, "-bg");
    841841    if (!status) {
    842842        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg");
    … …  
    844844    }
    845845
    846     psF64 bg_stdev = psMetadataLookupF64(&status, config->args, "-bg_stdev");
     846    psF32 bg_stdev = psMetadataLookupF32(&status, config->args, "-bg_stdev");
    847847    if (!status) {
    848848        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_stdev");
    … …  
    850850    }
    851851
    852     psF64 bg_mean_stdev = psMetadataLookupF64(&status, config->args, "-bg_mean_stdev");
     852    psF32 bg_mean_stdev = psMetadataLookupF32(&status, config->args, "-bg_mean_stdev");
    853853    if (!status) {
    854854        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_mean_stdev");
     855        return false;
     856    }
     857
     858    psF32 bias = psMetadataLookupF32(&status, config->args, "-bias");
     859    if (!status) {
     860        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bias");
     861        return false;
     862    }
     863
     864    psF32 bias_stdev = psMetadataLookupF32(&status, config->args, "-bias_stdev");
     865    if (!status) {
     866        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bias_stdev");
     867        return false;
     868    }
     869
     870    psF32 fringe_0 = psMetadataLookupF32(&status, config->args, "-fringe_0");
     871    if (!status) {
     872        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_0");
     873        return false;
     874    }
     875
     876    psF32 fringe_1 = psMetadataLookupF32(&status, config->args, "-fringe_1");
     877    if (!status) {
     878        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_1");
     879        return false;
     880    }
     881
     882    psF32 fringe_2 = psMetadataLookupF32(&status, config->args, "-fringe_2");
     883    if (!status) {
     884        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_2");
     885        return false;
     886    }
     887
     888    psF32 sigma_ra = psMetadataLookupF32(&status, config->args, "-sigma_ra");
     889    if (!status) {
     890        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sigma_ra");
     891        return false;
     892    }
     893
     894    psF32 sigma_dec = psMetadataLookupF32(&status, config->args, "-sigma_dec");
     895    if (!status) {
     896        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sigma_dec");
     897        return false;
     898    }
     899
     900    psF32 ap_resid = psMetadataLookupF32(&status, config->args, "-ap_resid");
     901    if (!status) {
     902        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ap_resid");
     903        return false;
     904    }
     905
     906    psF32 ap_resid_stdev = psMetadataLookupF32(&status, config->args, "-ap_resid_stdev");
     907    if (!status) {
     908        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ap_resid_stdev");
     909        return false;
     910    }
     911
     912    psF32 fwhm = psMetadataLookupF32(&status, config->args, "-fwhm");
     913    if (!status) {
     914        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm");
     915        return false;
     916    }
     917
     918    psF32 fwhm_range = psMetadataLookupF32(&status, config->args, "-fwhm_range");
     919    if (!status) {
     920        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm_range");
     921        return false;
     922    }
     923
     924    psS32 n_stars = psMetadataLookupS32(&status, config->args, "-n_stars");
     925    if (!status) {
     926        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_stars");
     927        return false;
     928    }
     929
     930    psS32 n_extended = psMetadataLookupS32(&status, config->args, "-n_extended");
     931    if (!status) {
     932        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_extended");
     933        return false;
     934    }
     935
     936    psS32 n_cr = psMetadataLookupS32(&status, config->args, "-n_cr");
     937    if (!status) {
     938        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_cr");
     939        return false;
     940    }
     941
     942    psS32 n_astrom = psMetadataLookupS32(&status, config->args, "-n_astrom");
     943    if (!status) {
     944        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_astrom");
    855945        return false;
    856946    }
    … …  
    877967        bg_stdev,
    878968        bg_mean_stdev,
     969        bias,
     970        bias_stdev,
     971        fringe_0,
     972        fringe_1,
     973        fringe_2,
     974        sigma_ra,
     975        sigma_dec,
     976        ap_resid,
     977        ap_resid_stdev,
     978        fwhm,
     979        fwhm_range,
     980        n_stars,
     981        n_extended,
     982        n_cr,
     983        n_astrom,
    879984        path_base,
    880985        code
    881     );
     986        );
    882987}
    883988

  • trunk/ippTools/src/chiptoolConfig.c

    r13580 r13649  
    7272    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time",  0,
    7373            "search by exposure time", NAN);
     74
     75    // XXX EAM : are these selecting based on the rawExp value or the chipImfile value?
    7476    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg",  0,
    75             "search by exposue background", NAN);
     77            "search by exposure background", NAN);
    7678    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev",  0,
    77             "search by exposue background stdev", NAN);
     79            "search by exposure background stdev", NAN);
    7880    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
    79             "search by exposue background mean stdev", NAN);
     81            "search by exposure background mean stdev", NAN);
    8082    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt",  0,
    8183            "search by altitute", NAN);
    … …  
    129131    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri",  0,
    130132            "define URL", NULL);
    131     psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg",  0,
    132             "define exposue background", NAN);
    133     psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev",  0,
    134             "define exposue background stdev", NAN);
    135     psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
    136             "define exposue background mean stdev", NAN);
     133    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg",  0,
     134            "define exposure background", NAN);
     135    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev",  0,
     136            "define exposure background stdev", NAN);
     137    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
     138            "define exposure background mean stdev", NAN);
     139
     140    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bias",  0,
     141            "define bias", NAN);
     142    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-bias_stdev",  0,
     143            "define bias stdev", NAN);
     144    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_0",  0,
     145            "define fringe term 0", NAN);
     146    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_1",  0,
     147            "define fringe term 1", NAN);
     148    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fringe_2",  0,
     149            "define fringe term 2", NAN);
     150    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sigma_ra",  0,
     151            "define error in RA", NAN);
     152    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sigma_dec",  0,
     153            "define error in DEC", NAN);
     154    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ap_resid",  0,
     155            "define aperture residual", NAN);
     156    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-ap_resid_stdev",  0,
     157            "define aperture residual stdev", NAN);
     158    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm",  0,
     159            "define fwhm (arcsec)", NAN);
     160    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-fwhm_range",  0,
     161            "define fwhm range (min to max)", NAN);
     162
     163    psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_stars",  0,
     164            "define number of stars in image", 0);
     165    psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_extended",  0,
     166            "define number of extended objects in image", 0);
     167    psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_cr",  0,
     168            "define number of cosmic rays in image", 0);
     169    psMetadataAddS32(addprocessedimfileArgs, PS_LIST_TAIL, "-n_astrom",  0,
     170            "define number of astrometry stars used", 0);
     171
    137172    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base",  0,
    138             "define banana 1", NULL);
     173            "define base output location", NULL);
    139174    psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
    140175            "set fault code", 0);
Note: See TracChangeset for help on using the changeset viewer.