IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 35154


Ignore:
Timestamp:
Feb 12, 2013, 4:24:02 PM (13 years ago)
Author:
bills
Message:

Further changes to background spur in the pipeline.

  1. Add chipBackgroundRun.cam_id
  2. Use camera stage mask instead of chip stage mask
  3. Drop warpBackgroundRun.alt_cam_label use chipBackgroundRun.cam_id to find the astrometry
  4. Fix broken processing of chipBackground stats output
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/dbconfig/background.md

    r35134 r35154  
    55    chip_bg_id          S64     0
    66    chip_id             S64     0
     7    cam_id              S64     0
    78    state               STR     64
    89    workdir             STR     255
     
    4849    dist_group          STR     64
    4950    reduction           STR     64
    50     alt_cam_label       STR     64
    5151    note                STR     255
    5252    registered          TAI     NULL
  • trunk/ippScripts/scripts/background_chip.pl

    r35118 r35154  
    4343# Parse the command-line arguments
    4444my ( $chip_bg_id, $class_id, $camera, $outroot, $dbname, $reduction, $verbose,
    45      $threads, $no_update, $save_temps, $no_op, $redirect, $chip_path_base, $magicked );
     45     $threads, $no_update, $save_temps, $no_op, $redirect, $chip_path_base, $cam_path_base, $magicked );
    4646GetOptions(
    4747    'chip_bg_id=s'      => \$chip_bg_id,    # chipBackgroundRun identifier
     
    5353    'threads=s'         => \$threads,   # Number of threads to use
    5454    'chip_path_base=s'  => \$chip_path_base, # optional chip_path_base
     55    'cam_path_base=s'   => \$cam_path_base, # optional camera stage path_base
    5556    'magicked=s'        => \$magicked,  # magicked status of input
    5657    'verbose'           => \$verbose,   # Print to stdout
     
    9495my $dump_config;
    9596if ($chip_path_base and $no_update) {
     97    # XXX: this path through the code has not been excercized in awhile and probably does not work
     98
    9699    # we are running outside of a chip_bg_run (perhaps by the postage stamp server) don't dump config
    97100    # or do stats. Get path to input from command line.
     
    119122    my $input = $$inputs[0];    # Input of interest
    120123    $in_path = $input->{path_base};
     124    $cam_path_base = $input->{cam_path_base};
    121125    $magicked = $input->{magicked};
    122126}
    123127
    124128my $in_image = $ipprc->filename("PPIMAGE.CHIP", $in_path, $class_id);
    125 my $in_mask = $ipprc->filename("PPIMAGE.CHIP.MASK", $in_path, $class_id);
     129my $in_mask;
     130if ($cam_path_base) {
     131    $in_mask = $ipprc->filename("PSASTRO.OUTPUT.MASK", $cam_path_base, $class_id);
     132} else {
     133    $in_mask = $ipprc->filename("PPIMAGE.CHIP.MASK", $in_path, $class_id);
     134}
    126135my $in_wt = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $in_path, $class_id);
    127136my $in_bg = $ipprc->filename("PSPHOT.BACKMDL", $in_path, $class_id);
     
    177186
    178187my $apply_auxiliary_mask = 1;
     188# XXX Temporary lookup of auxiliary mask file from static location.
     189# At some point I'll convert this to register the masks in the database and use detselect
    179190if ($apply_auxiliary_mask) {
    180191    my @auxmask_start_date = qw(
     
    238249    print "Auxililary mask file is $auxmask\n";
    239250}
    240    
    241251
    242252
     
    272282    &my_die("Couldn't find expected output file: $out_stats", $chip_bg_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($out_stats);
    273283
    274     my $command = "$ppStatsFromMetadata $out_stats - BACKGROUND_CHIP";
     284    my $resolved_stats = $ipprc->file_resolve($out_stats);
     285    my $command = "$ppStatsFromMetadata $resolved_stats - BACKGROUND_CHIP";
    275286    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
    276287        run(command => $command, verbose => $verbose);
  • trunk/ippScripts/scripts/background_warp.pl

    r35134 r35154  
    3939
    4040my ($warp_bg_id, $skycell_id, $tess_dir, $reduction, $camera, $dbname, $outroot, $threads, $verbose, $no_update, $no_op, $redirect, $save_temps);
    41 my ($astrometry, $imageName, $maskName, $weightName, $magicked, $exp_tag, $alternate_astrometry_label);
     41my ($astrometry, $imageName, $maskName, $weightName, $magicked);
    4242GetOptions(
    4343    'warp_bg_id|i=s'      => \$warp_bg_id, # Warp identifier
    4444    'skycell_id|s=s'      => \$skycell_id, # Skycell identifier
    4545    'tess_dir|s=s'        => \$tess_dir, # Tesselation identifier
    46     'exp_tag|=s'          => \$exp_tag, # exposure tag
    4746    'camera|c=s'          => \$camera, # Camera name
    4847    'dbname|d=s'          => \$dbname, # Database name
     
    5251    'mask-list=s'         => \$maskName, # list of input mask files
    5352    'astrometry=s'        => \$astrometry,
    54     'alt_cam_label=s'     => \$alternate_astrometry_label,  # camRun.label for alternate astrometry
    5553    'magicked=s'          => \$magicked,
    5654    'threads=s'           => \$threads,   # Number of threads to use for pswarp
     
    8684}
    8785
    88 if ($alternate_astrometry_label) {
    89     my_die( "--exp_tag is required when using alternate astrometry", $warp_bg_id, $skycell_id, $PS_EXIT_PROG_ERROR )
    90         unless defined $exp_tag;
    91 }
    92 
    9386my $ipprc = PS::IPP::Config->new( $camera ) or
    9487my_die( "Unable to set up", $warp_bg_id, $skycell_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
     
    128121if (!defined $imageName) {
    129122    # go find our inputs
    130     my $astrom_path_base;
    131     if (defined $alternate_astrometry_label) {
    132         my $command = "$camtool -processedexp -exp_tag $exp_tag -label $alternate_astrometry_label";
    133         $command .= " -dbname $dbname" if $dbname;
    134         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
    135             run(command => $command, verbose => $verbose);
    136         unless ($success) {
    137             $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
    138             &my_die("Unable to perform camtool -processedexp: $error_code", $warp_bg_id, $error_code);
    139         }
    140         my $entries = $mdcParser->parse_list(join "", @$stdout_buf) or
    141             &my_die("Unable to parse metadata config doc", $warp_bg_id, $PS_EXIT_PROG_ERROR);
    142         my $entry = $entries->[0];
    143         $astrom_path_base = $entry->{path_base};
    144     }
    145 
    146123    my ($imageFile, $maskFile, $weightFile);
    147124    ($imageFile, $imageName) = tempfile( "$tempOutRoot.image.list.XXXX",  UNLINK => !$save_temps);
     
    176153        $magicked = $file->{magicked};
    177154
    178         if (!$astrom_path_base) {
    179             my $cam_path = $file->{cam_path_base};
    180             my $astrom = $ipprc->filename($astromSource, $cam_path);
    181             &my_die("Astrometry files don't match: $astrom vs $astrometry", $warp_bg_id, $skycell_id, $PS_EXIT_PROG_ERROR) if defined $astrometry and $astrom ne $astrometry;
    182             $astrometry = $astrom;
    183         } elsif (!$astrometry) {
    184             # using alternate astrometry
    185             $astrometry = $ipprc->filename($astromSource, $astrom_path_base);
    186         }
     155        my $cam_path = $file->{cam_path_base};
     156        my $astrom = $ipprc->filename($astromSource, $cam_path);
     157        &my_die("Astrometry files don't match: $astrom vs $astrometry", $warp_bg_id, $skycell_id, $PS_EXIT_PROG_ERROR) if defined $astrometry and $astrom ne $astrometry;
     158        $astrometry = $astrom;
    187159    }
    188160    close $imageFile;
  • trunk/ippTools/share/bgtool_chipinputs.sql

    r28486 r35154  
    11SELECT
    2     chipProcessedImfile.*
     2    chipProcessedImfile.*,
     3    camProcessedExp.path_base AS cam_path_base
    34FROM chipBackgroundRun
    45JOIN chipRun USING(chip_id)
    56JOIN chipProcessedImfile USING(chip_id)
     7LEFT JOIN camProcessedExp ON chipBackgroundRun.cam_id = camProcessedExp.cam_id
    68WHERE chipRun.state = 'full'
    79    AND chipProcessedImfile.fault = 0
  • trunk/ippTools/share/bgtool_definechip.sql

    r35119 r35154  
    11SELECT
    2     chipRun.*
     2    chipRun.*,
     3    camRun.cam_id,
     4    chip_bg_id,
     5    CURRENT_TIMESTAMP AS registered
    36FROM chipRun
    47JOIN rawExp USING(exp_id)
    5 LEFT JOIN chipBackgroundRun USING(chip_id)
    6 WHERE chipRun.state = 'full'
     8JOIN chipRun as altChipRun USING(exp_id)
     9JOIN camRun ON altChipRun.chip_id = camRun.chip_id
     10JOIN camProcessedExp USING(cam_id)
     11LEFT JOIN chipBackgroundRun ON chipBackgroundRun.chip_id = chipRun.chip_id -- labelHook %s
     12WHERE chipRun.state = 'full' AND camRun.state ='full' AND camProcessedExp.quality = 0
  • trunk/ippTools/share/bgtool_definewarp.sql

    r28551 r35154  
    11SELECT
    2     warpRun.*,
    3     chipBackgroundRun.chip_bg_id
     2    warpRun.warp_id,
     3    chipBackgroundRun.*
     4    -- the following items are selected for aid in debugging
     5    ,
     6    warpsChipRun.chip_id as warpschip_id,
     7    chipRun.chip_id AS thischip_id,
     8    warpBackgroundRun.warp_bg_id
    49FROM warpRun
    510JOIN fakeRun USING(fake_id)
    611JOIN camRun USING(cam_id)
    7 JOIN chipRun USING(chip_id)
    8 JOIN chipBackgroundRun USING(chip_id)
     12JOIN chipRun as warpsChipRun ON camRun.chip_id = warpsChipRun.chip_id
    913JOIN rawExp USING(exp_id)
    10 LEFT JOIN warpBackgroundRun USING(chip_bg_id)
     14JOIN chipRun USING(exp_id)
     15JOIN chipBackgroundRun ON chipRun.chip_id = chipBackgroundRun.chip_id
     16    AND (chipBackgroundRun.cam_id = camRun.cam_id OR chipBackgroundRun.cam_id = 0)
     17LEFT JOIN warpBackgroundRun ON chipBackgroundRun.chip_bg_id = warpBackgroundRun.warp_bg_id -- label hook %s
    1118WHERE chipBackgroundRun.state = 'full'
    12     AND warpRun.state IN ('full', 'cleaned', 'goto_cleaned') -- only need it to have been completed
     19    AND warpRun.state IN ('full', 'cleaned', 'goto_cleaned') -- need warp to have completed so warpSkyCellMap is populated
  • trunk/ippTools/share/bgtool_tochip.sql

    r28486 r35154  
    1616    AND (Label.active OR Label.active IS NULL)
    1717-- WHERE hook %s
    18 ORDER BY priority DESC, chip_bg_id
     18ORDER BY priority DESC, chip_bg_id, class_id
  • trunk/ippTools/share/bgtool_warp.sql

    r35134 r35154  
    44    warpBackgroundRun.workdir,
    55    warpBackgroundRun.label,
    6     warpBackgroundRun.alt_cam_label,
    76    rawExp.exp_id,
    87    rawExp.exp_name,
  • trunk/ippTools/share/bgtool_warpinputs.sql

    r28747 r35154  
    1111JOIN chipBackgroundImfile USING(chip_bg_id, class_id)
    1212JOIN fakeRun USING(fake_id)
    13 JOIN camProcessedExp USING(cam_id)
     13JOIN camProcessedExp ON camProcessedExp.cam_id = fakeRun.cam_id
    1414WHERE warpRun.state IN ('full', 'cleaned', 'goto_cleaned') -- only need it to have been completed
    1515    AND warpSkyfile.fault = 0
  • trunk/ippTools/src/bgtool.c

    r35134 r35154  
    285285    psMetadata *where = psMetadataAlloc();
    286286    PXOPT_COPY_S64(config->args,   where, "-chip_id",            "chipRun.chip_id",       "==");
     287    PXOPT_COPY_S64(config->args,   where, "-cam_id",             "camRun.cam_id",         "==");
    287288    PXOPT_COPY_S64(config->args,   where, "-exp_id",             "rawExp.exp_id",         "==");
    288289    PXOPT_COPY_STR(config->args,   where, "-exp_name",           "rawExp.exp_name",       "==");
     
    324325    PXOPT_COPY_F32(config->args,   where, "-sun_angle_min",      "rawExp.sun_angle",      ">=");
    325326    PXOPT_COPY_F32(config->args,   where, "-sun_angle_max",      "rawExp.sun_angle",      "<");
    326     pxAddLabelSearchArgs(config,   where, "-label",              "chipRun.label",         "==");
     327    PXOPT_COPY_STR(config->args,   where, "-label",              "chipRun.label",         "==");
     328    PXOPT_COPY_STR(config->args,   where, "-cam_label",          "camRun.label",          "==");
    327329
    328330    if (!psListLength(where->list)) {
     
    343345    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    344346    PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
     347    PXOPT_LOOKUP_STR(cam_label, config->args, "-cam_label", false, false);
     348    PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false);
     349    if (!cam_id && !cam_label) {
     350        psError(PXTOOLS_ERR_CONFIG, true, "either cam_id or cam_label is required");
     351        return false;
     352    }
    345353
    346354    // Get chip runs to promote to chipBackgroundRun
     
    364372    }
    365373
     374    psString labelHook = psStringCopy("");
    366375    if (!rerun) {
    367         psStringAppend(&query, "\nAND chipBackgroundRun.chip_bg_id IS NULL");
    368376        if (label) {
    369             psStringAppend(&query,
    370                            "\nAND (chipBackgroundRun.label = '%s'"
    371                            " OR chipBackgroundRun.label IS NULL)",
    372                            label);
    373         }
    374         if (data_group) {
    375             psStringAppend(&query,
    376                            "\nAND (chipBackgroundRun.data_group = '%s'"
    377                            " OR chipBackgroundRun.data_group IS NULL)",
    378                            data_group);
    379         }
    380         if (dist_group) {
    381             psStringAppend(&query,
    382                            "\nAND (chipBackgroundRun.dist_group = '%s'"
    383                            " OR chipBackgroundRun.dist_group IS NULL)",
    384                            dist_group);
    385         }
     377            // check for run with the newly specified label
     378            psStringAppend(&labelHook, "\nAND (chipBackgroundRun.label = '%s')", label);
     379        }
     380        psStringAppend(&query, "\nAND chip_bg_id IS NULL");
    386381    }
    387382
     
    391386    }
    392387
    393     if (!p_psDBRunQuery(config->dbh, query)) {
     388    if (!p_psDBRunQueryF(config->dbh, query, labelHook)) {
    394389        psError(psErrorCodeLast(), false, "database error");
    395390        psFree(query);
     391        psFree(labelHook);
    396392        if (!psDBRollback(config->dbh)) {
    397393            psError(psErrorCodeLast(), false, "database error");
     
    400396    }
    401397    psFree(query);
     398    psFree(labelHook);
    402399
    403400    psArray *output = p_psDBFetchResult(config->dbh); // Matching rows
     
    420417    if (pretend) {
    421418        // negative simple so the default is true
    422         if (!ippdbPrintMetadatas(stdout, output, "chipRun", !simple)) {
     419        if (!ippdbPrintMetadatas(stdout, output, "chipBackgroundRun", !simple)) {
    423420            psError(psErrorCodeLast(), false, "failed to print array");
    424421            psFree(output);
     
    435432        psMetadata *md = output->data[i];
    436433
    437         chipRunRow *row = chipRunObjectFromMetadata(md);
     434        chipBackgroundRunRow *row = chipBackgroundRunObjectFromMetadata(md);
    438435        if (!row) {
    439436            psError(psErrorCodeLast(), false, "failed to convert metadata into fakeRun");
     
    445442        }
    446443
    447         if (!chipBackgroundRunInsert(config->dbh, 0, row->chip_id, "new",
     444        if (!chipBackgroundRunInsert(config->dbh, 0, row->chip_id, row->cam_id, "new",
    448445                                     workdir     ? workdir    : row->workdir,
    449446                                     label       ? label      : row->label,
     
    560557
    561558    if (psArrayLength(output)) {
    562         if (!ippdbPrintMetadatas(stdout, output, "chipBackgroundRun", !simple)) {
     559        if (!ippdbPrintMetadatas(stdout, output, "pendingchipBackgroundRun", !simple)) {
    563560            psError(psErrorCodeLast(), false, "failed to print array");
    564561            psFree(output);
     
    621618        return true;
    622619    }
    623     if (!ippdbPrintMetadatas(stdout, output, "chipBackgroundImfile", !simple)) {
     620    if (!ippdbPrintMetadatas(stdout, output, "pendingchipBackgroundImfile", !simple)) {
    624621        psError(psErrorCodeLast(), false, "failed to print array");
    625622        psFree(output);
     
    12951292    PXOPT_COPY_F32(config->args,   where, "-sun_angle_max",      "rawExp.sun_angle",      "<");
    12961293    pxAddLabelSearchArgs(config,   where, "-warp_label",         "warpRun.label",         "==");
    1297     pxAddLabelSearchArgs(config,   where, "-chip_label",         "chipBackgroundRun.label", "==");
     1294    pxAddLabelSearchArgs(config,   where, "-chip_bg_label",      "chipBackgroundRun.label", "==");
     1295    pxAddLabelSearchArgs(config,   where, "-chip_label",         "chipRun.label",         "==");
    12981296
    12991297    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     
    13101308    PXOPT_LOOKUP_STR(dist_group, config->args, "-set_dist_group", false, false);
    13111309    PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false);
    1312     PXOPT_LOOKUP_STR(alt_cam_label, config->args, "-set_alt_cam_label", false, false);
    13131310    PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false);
    13141311    PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
     
    13361333    }
    13371334
     1335    psString labelHook = psStringCopy("");
    13381336    if (!rerun) {
    1339         psStringAppend(&query, "\nAND warpBackgroundRun.warp_bg_id IS NULL");
    13401337        if (label) {
    1341             psStringAppend(&query,
    1342                            "\nAND (warpBackgroundRun.label = '%s'"
    1343                            " OR warpBackgroundRun.label IS NULL)",
    1344                            label);
    1345         }
    1346         if (data_group) {
    1347             psStringAppend(&query,
    1348                            "\nAND (warpBackgroundRun.data_group = '%s'"
    1349                            " OR warpBackgroundRun.data_group IS NULL)",
    1350                            data_group);
    1351         }
    1352         if (dist_group) {
    1353             psStringAppend(&query,
    1354                            "\nAND (warpBackgroundRun.dist_group = '%s'"
    1355                            " OR warpBackgroundRun.dist_group IS NULL)",
    1356                            dist_group);
    1357         }
     1338            // check for run with the newly specified label
     1339            psStringAppend(&labelHook, "\nAND (warpBackgroundRun.label = '%s')", label);
     1340        }
     1341        psStringAppend(&query, "\nAND warp_bg_id IS NULL");
    13581342    }
    13591343
     
    13631347    }
    13641348
    1365     if (!p_psDBRunQuery(config->dbh, query)) {
    1366         psError(psErrorCodeLast(), false, "database error");
     1349    if (!p_psDBRunQueryF(config->dbh, query, labelHook)) {
     1350        psError(psErrorCodeLast(), false, "database error");
     1351        psFree(labelHook);
    13671352        psFree(query);
    13681353        if (!psDBRollback(config->dbh)) {
     
    13711356        return false;
    13721357    }
     1358    psFree(labelHook);
    13731359    psFree(query);
    13741360
     
    13921378    if (pretend) {
    13931379        // negative simple so the default is true
    1394         if (!ippdbPrintMetadatas(stdout, output, "warpRun", !simple)) {
     1380        if (!ippdbPrintMetadatas(stdout, output, "warpBackgroundRun", !simple)) {
    13951381            psError(psErrorCodeLast(), false, "failed to print array");
    13961382            psFree(output);
     
    14091395        psS64 chip_bg_id = psMetadataLookupS64(NULL, md, "chip_bg_id");
    14101396
    1411         warpRunRow *row = warpRunObjectFromMetadata(md);
     1397       
     1398        warpBackgroundRunRow *row = warpBackgroundRunObjectFromMetadata(md);
    14121399        if (!row) {
    1413             psError(psErrorCodeLast(), false, "failed to convert metadata into fakeRun");
     1400            psError(psErrorCodeLast(), false, "failed to convert metadata into warpRun");
    14141401            psFree(output);
    14151402            if (!psDBRollback(config->dbh)) {
     
    14251412                                     dist_group  ? dist_group : row->dist_group,
    14261413                                     reduction   ? reduction  : row->reduction,
    1427                                      alt_cam_label,
    14281414                                     note        ? note       : row->note,
    14291415                                     NULL, 0)) {
  • trunk/ippTools/src/bgtoolConfig.c

    r35134 r35154  
    5050    psMetadata *definechipArgs = psMetadataAlloc();
    5151    psMetadataAddS64(definechipArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0);
     52    psMetadataAddS64(definechipArgs, PS_LIST_TAIL, "-cam_id", 0, "choose cam_id", 0);
    5253    psMetadataAddS64(definechipArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0);
    5354    psMetadataAddStr(definechipArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL);
     
    8990    psMetadataAddF32(definechipArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "search by min solar angle", NAN);
    9091    psMetadataAddF32(definechipArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "search by max solar angle", NAN);
    91     psMetadataAddStr(definechipArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search on chipRun label", NULL);
     92    psMetadataAddStr(definechipArgs, PS_LIST_TAIL, "-label", 0, "search on chipRun label", NULL);
     93    psMetadataAddStr(definechipArgs, PS_LIST_TAIL, "-cam_label", 0, "search on camRun label", NULL);
    9294    psMetadataAddBool(definechipArgs, PS_LIST_TAIL, "-destreaked", 0, "search for runs that have been destreaked", false);
    9395    psMetadataAddBool(definechipArgs, PS_LIST_TAIL, "-rerun", 0, "re-run data?", false);
     
    279281    psMetadataAddF32(definewarpArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "search by max solar angle", NAN);
    280282    psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-warp_label", PS_META_DUPLICATE_OK, "search on warpRun label", NULL);
    281     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-chip_label", PS_META_DUPLICATE_OK, "search on chipBackgroundRun label", NULL);
     283    psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-chip_label", PS_META_DUPLICATE_OK, "search on chipRun label", NULL);
     284    psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-chip_bg_label", PS_META_DUPLICATE_OK, "search on chipBackgroundRun label", NULL);
    282285    psMetadataAddBool(definewarpArgs, PS_LIST_TAIL, "-destreaked", 0, "search for runs that have been destreaked", false);
    283286    psMetadataAddBool(definewarpArgs, PS_LIST_TAIL, "-rerun", 0, "rerun data?", false);
     
    285288    psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL);
    286289    psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL);
    287     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_alt_cam_label", 0, "define alternate astrometry sources", NULL);
    288290    psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_data_group", 0, "define data group", NULL);
    289291    psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define dist group", NULL);
Note: See TracChangeset for help on using the changeset viewer.