IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 15684 for trunk/ippTools/src


Ignore:
Timestamp:
Nov 23, 2007, 2:02:30 PM (18 years ago)
Author:
jhoblitt
Message:

update flatcoor -newrun options
fix flatcorr -> flatcorrp typo

Location:
trunk/ippTools/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/flatcorr.c

    r15606 r15684  
    3737static bool updateMode(pxConfig *config);
    3838
    39 static bool setflatcorrpRunState(pxConfig *config, psS64 corr_id, const char *state);
     39static bool setflatcorrRunState(pxConfig *config, psS64 corr_id, const char *state);
    4040
    4141# define MODECASE(caseName, func) \
    … …  
    317317
    318318    // set the flatcorrRun to a state of 'run'
    319     if (!setflatcorrpRunState(config, corr_id, "run")) {
     319    if (!setflatcorrRunState(config, corr_id, "run")) {
    320320        if (!psDBRollback(config->dbh)) {
    321321            psError(PS_ERR_UNKNOWN, false, "database error");
    … …  
    348348
    349349
    350 static bool setflatcorrpRunState(pxConfig *config, psS64 corr_id, const char *state)
     350static bool setflatcorrRunState(pxConfig *config, psS64 corr_id, const char *state)
    351351{
    352352    PS_ASSERT_PTR_NON_NULL(state, false);
    … …  
    363363    }
    364364
    365     char *query = "UPDATE flatcorrpRun SET state = '%s' WHERE corr_id = %" PRId64;
     365    char *query = "UPDATE flatcorrRun SET state = '%s' WHERE corr_id = %" PRId64;
    366366    if (!p_psDBRunQuery(config->dbh, query, state, corr_id)) {
    367367        psError(PS_ERR_UNKNOWN, false,

  • trunk/ippTools/src/flatcorrConfig.c

    r15578 r15684  
    4949    // -newrun
    5050    psMetadata *newrunArgs = psMetadataAlloc();
    51     psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-dvodb",  0,
    52             "define DVO db (required)", NULL);
     51    // XXX need to allow multiple exp_ids
     52    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-exp_id",  0,
     53            "search by exp_id", NULL);
     54    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-exp_name",  0,
     55            "search by exp_name", NULL);
     56    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-inst",  0,
     57            "search for camera", NULL);
     58    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-telescope",  0,
     59            "search for telescope", NULL);
     60    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-dateobs_begin", 0,   
     61            "search for exposures by time (>=)", NULL);
     62    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-dateobs_end", 0,
     63            "search for exposures by time (<)", NULL);
     64    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-exp_tag",  0,
     65            "search by exp_tag", NULL);
     66    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-exp_type",  0,
     67            "search by exp_type", NULL);
     68    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-filelevel",  0,
     69            "search by filelevel", NULL);
     70    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-reduction",  0,
     71            "search by reduction class", NULL);
     72    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-filter",  0,
     73            "search for filter", NULL);
     74    psMetadataAddF32(newrunArgs, PS_LIST_TAIL, "-airmass_min",  0,
     75            "define min airmass", NAN);
     76    psMetadataAddF32(newrunArgs, PS_LIST_TAIL, "-airmass_max",  0,
     77            "define max airmass", NAN);
     78    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-ra_min",  0,
     79            "define min", NAN);
     80    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-ra_max",  0,
     81            "define max", NAN);
     82    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-decl_min",  0,
     83            "define min", NAN);
     84    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-decl_max",  0,
     85            "define max", NAN);
     86    psMetadataAddF32(newrunArgs, PS_LIST_TAIL, "-exp_time_min",  0,
     87            "define min", NAN);
     88    psMetadataAddF32(newrunArgs, PS_LIST_TAIL, "-exp_time_max",  0,
     89            "define max", NAN);
     90    psMetadataAddF32(newrunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,
     91            "define max fraction of saturated pixels", NAN);
     92    psMetadataAddF32(newrunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,
     93            "define min fraction of saturated pixels", NAN);
     94    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-bg_min",  0,
     95            "define max", NAN);
     96    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-bg_max",  0,
     97            "define max", NAN);
     98    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,
     99            "define max", NAN);
     100    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,
     101            "define max", NAN);
     102    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,
     103            "define max", NAN);
     104    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,
     105            "define max", NAN);
     106    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-alt_min",  0,
     107            "define min", NAN);
     108    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-alt_max",  0,
     109            "define max", NAN);
     110    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-az_min",  0,
     111            "define min", NAN);
     112    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-az_max",  0,
     113            "define max", NAN);
     114    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,   
     115            "define min ccd tempature", NAN);
     116    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
     117            "define max ccd tempature", NAN);
     118    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-posang_min",  0,
     119            "define min rotator position angle", NAN);
     120    psMetadataAddF64(newrunArgs, PS_LIST_TAIL, "-posang_max",  0,
     121            "define max rotator position angle", NAN);
     122    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-object",  0,
     123            "search by exposure object", NULL);
     124    psMetadataAddF32(newrunArgs, PS_LIST_TAIL, "-solang_min",  0,
     125            "define min solar angle", NAN);
     126    psMetadataAddF32(newrunArgs, PS_LIST_TAIL, "-solang_max",  0,
     127            "define max solar angle", NAN);
     128    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-set_workdir",  0,
     129            "define workdir", NULL);
     130    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-set_label",  0,
     131            "define label", NULL);
     132    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-set_reduction",  0,
     133            "define reduction class", NULL);
     134    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-set_expgroup",  0,
     135            "define exposure group", NULL);
     136    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-set_dvodb",  0,
     137            "define DVO db", NULL);
    53138
    54139    // -pending
Note: See TracChangeset for help on using the changeset viewer.