IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31958


Ignore:
Timestamp:
Aug 1, 2011, 1:55:41 PM (15 years ago)
Author:
watersc1
Message:

Update to LAP to remove quickstacks. This introduced changes to stacktool to support this, so it is being merged as well. This version of stacktool enables cleaning stacks, so ipp_cleanup.pl is included in this set.

psastro.config change is to switch LAP processing back to the synthetic reference catalog.

Location:
tags/ipp-20110622
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • tags/ipp-20110622/ippScripts/scripts/ipp_cleanup.pl

    r30909 r31958  
    172172            addFilename (\@files, "PPIMAGE.CHIP.MASK", $path_base, $class_id, 1);
    173173            addFilename (\@files, "PPIMAGE.CHIP.VARIANCE", $path_base, $class_id, 1);
     174            addFilename (\@files, "PPIMAGE.PATTERN", $path_base, $class_id, 0);
    174175            if ($mode eq "goto_purged") {
    175176                # additional files to remove for 'purge' mode
     
    544545            addFilename(\@files, "PPSTACK.OUTPUT.MASK", $path_base, $skycell_id);
    545546            addFilename(\@files, "PPSTACK.OUTPUT.VARIANCE", $path_base, $skycell_id);
    546 
     547            addFilename(\@files, "PPSTACK.OUTPUT.EXP", $path_base, $skycell_id);
     548            addFilename(\@files, "PPSTACK.OUTPUT.EXPNUM", $path_base, $skycell_id);
     549            addFilename(\@files, "PPSTACK.OUTPUT.EXPWT", $path_base, $skycell_id);
     550            addFilename(\@files, "PPSTACK.UNCONV", $path_base, $skycell_id);
     551            addFilename(\@files, "PPSTACK.UNCONV.MASK", $path_base, $skycell_id);
     552            addFilename(\@files, "PPSTACK.UNCONV.VARIANCE", $path_base, $skycell_id);
     553            addFilename(\@files, "PPSTACK.UNCONV.EXP", $path_base, $skycell_id);
     554            addFilename(\@files, "PPSTACK.UNCONV.EXPNUM", $path_base, $skycell_id);
     555            addFilename(\@files, "PPSTACK.UNCONV.EXPWT", $path_base, $skycell_id);
     556           
    547557            if ($mode eq "goto_purged") {
    548558                # additional files to remove for 'purge' mode
  • tags/ipp-20110622/ippScripts/scripts/lap_science.pl

    r31948 r31958  
    11#!/usr/bin/env perl
    2 
    32
    43use warnings;
     
    3029my ( $chip_mode, $monitor_mode, $cleanup_mode);
    3130
    32 # Global configuration constants that probably should be read from elsewhere.
    33 my $qstack_threshold = 0.05; # Only make a quickstack if more than 5% of the exposures require it.
     31#
     32# Global configuration constants that probably should be read from elsewhere. 
     33my $qstack_threshold     = 0.05; # Only make a quickstack if more than 5% of the exposures require it.
     34my $minimum_stack_inputs = 6;    # We can avoid magicking stack inputs if we have more than this number.
    3435
    3536GetOptions(
     
    263264        }
    264265
    265 
    266266        if (S64_IS_NOT_NULL($chip_id)) { # We already have a defined chip_id
    267267            if (($pairwise) && !($pair_id)) {
     
    283283            $counter++;
    284284        }
    285         print "ZZ: $exp_id $object $comment $matching{$object}{$comment}\n";
     285        if ($verbose) {
     286            print "ZZ: $exp_id $object $comment $matching{$object}{$comment}\n";
     287        }
    286288    }
    287289
     
    322324    # Scan all exposures, and ensure that pairwise and private are set correctly
    323325    foreach my $exposure (@$exposures) {
    324         print "YY: $exposure\n";
     326        if ($verbose) {
     327            print "YY: $exposure\n";
     328        }
    325329        if ($exposure->{pairwise} && !($exposure->{pair_id})) {
    326330            $exposure->{pairwise} = 0; # We marked it for pairwise diffs, but didn't match it. Probably an error.
     
    451455
    452456    # Things I want to know before I'm through
    453     my $needs_qstack = 0;
     457#     my $needs_qstack = 0;
    454458    my $needs_something_remade = 0;
    455459    my $needs_something_private = 0;
    456     my $can_qstack = 0;
    457     my $have_diff = 0;
    458     my $can_diff = 0;
    459     my $can_fstack = 0;
     460#     my $can_qstack = 0;
     461     my $have_diff = 0;
     462     my $can_diff = 0;
     463#     my $can_fstack = 0;
    460464    my $total_exposures = 0;
     465
    461466    my @lonely_exposures = ();
     467
     468    my $are_warped = 0;
     469    my $are_magicked = 0;
     470
    462471    foreach my $exposure (@$exposures) {
    463472        $total_exposures++;
     
    485494       
    486495        if ($exposure->{private}) { # I've declared this exposure private to this lapRun.
    487             $needs_qstack++;
     496#           $needs_qstack++;
    488497            push @lonely_exposures, $exposure;
    489498#           $lonely_exposures++;
     
    526535            unless ((defined($exposure->{diffRun_state}))&&
    527536                    ($exposure->{diffRun_state} eq 'full')) {
    528                 $needs_qstack++;
     537                $are_warped++;
     538#               $needs_qstack++;
    529539                $needs_something_private = 1;
    530540                if ($companion) {
     
    542552        }
    543553       
     554        if  ($exposure->{data_state} eq 'drop') { # This exposure is impossible, so fudge the counts so we get through.
     555            $are_warped++;
     556#           $can_qstack ++;
     557            $can_diff ++;
     558            $have_diff ++;
     559            $are_magicked ++;
     560#           $can_fstack ++;         
     561            next;
     562        }
     563
    544564        if (($exposure->{warpRun_state})&&  # This exposure has a warp
    545565            ($exposure->{warpRun_state} eq 'full')) { # This exposure's warp is done.
    546             $can_qstack ++;
     566            $are_warped++;
     567#           $can_qstack ++;
    547568            $can_diff ++;
    548569        }
    549570        if (($exposure->{magicked}&&
    550571             &S64_IS_NOT_NULL($exposure->{magicked}))) {  # This exposure has been magicked, so it is through with diff.
    551             $can_fstack ++;
     572            $are_magicked++;
     573#           $can_fstack ++;
    552574        }
    553575        if (($exposure->{diff_id})&&(&S64_IS_NOT_NULL($exposure->{diff_id}))) {
     
    562584    print "STATUS: HAVE_FSTACK:     $have_fstack\n";
    563585
    564     print "STATUS: NEEDS_QSTACK:    $needs_qstack\n";
     586#    print "STATUS: NEEDS_QSTACK:    $needs_qstack\n";
    565587    print "STATUS: NEEDS_REMADE:    $needs_something_remade\n";
    566588    print "STATUS: NEEDS PRIVATIZE: $needs_something_private\n";
    567     print "STATUS: CAN_QSTACK:      $can_qstack\n";
     589    print "STATUS: ARE WARPED:      $are_warped\n";
     590    print "STATUS: ARE MAGICKED:    $are_magicked\n";
     591#    print "STATUS: CAN_QSTACK:      $can_qstack\n";
    568592    print "STATUS: CAN_DIFF:        $can_diff\n";
    569593    print "STATUS: HAVE_DIFF:       $have_diff\n";
    570     print "STATUS: CAN_FSTACK:      $can_fstack\n";
     594#    print "STATUS: CAN_FSTACK:      $can_fstack\n";
    571595
    572596    print "STATUS: TOTAL_EXPOSURES: $total_exposures\n";
     
    576600        exit(0);
    577601    }
    578     if (($needs_qstack > 0)&&              # Do we need the quick stack?
    579         ($defined_qstack == 0)&&            # Have we not made it already?
    580         ($can_qstack == $total_exposures)&& # Are all warps done?
    581         ($needs_something_remade == 0)      # Do we need to wait for a stolen exposure?
    582         ) {
    583         if ($needs_qstack < $total_exposures * $qstack_threshold) { # Drop any exposures that are requiring the qstack
    584             print "STATUS: Insufficient unpaired exposures to justify quickstack.  Dropping unpaired exposures\n";
    585             foreach my $exposure (@lonely_exposures) {
    586                 $exposure->{data_state} = 'drop';
    587                 &update_this_exposure($exposure);
    588             }
    589             $needs_qstack = 0;
    590         }
    591         else {
    592             print "STATUS: Will now queue quickstacks\n";
    593             &queue_quickstack($exposures);
    594         }
    595     }
    596 
    597     if (($can_diff == $total_exposures)&&   # Are all warps done?
    598         ($needs_something_remade == 0)&&    # Do we need to wait for a stolen exposure?
    599         ($have_diff < $can_diff)&&          # We haven't already done them all.
    600         (($needs_qstack == 0)||             # Are we just doing pairwise diffs?
    601          ($needs_qstack == 1)&&($have_qstack == 1)) ) { # If we need a quickstack, do we have it?
    602         print "STATUS: Will now queue diffs\n";
    603         &queue_diffs($exposures);
    604     }
    605 
    606     if (($can_fstack == $total_exposures)&& # Are all warps done?
    607         ($needs_something_remade == 0)&&    # Do we need to wait for a stolen exposure?
    608         ($defined_fstack == 0)) {           # Have we not made it already?
    609         print "STATUS: Will now queue final stacks\n";
    610         &queue_finalstack($exposures);
    611     }
    612 
    613     if (($have_fstack == 1)) {              # Are we all done making the final product?
    614         print "STATUS: Will now deactivate exposures for this complete lapRun.\n";
    615         &deactivate_exposures($exposures);
    616         $command = "$laptool -updaterun -lap_id $lap_id";
    617         $command .= " -dbname $dbname " if defined $dbname;
    618         $command .= " -set_state full ";
    619         my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
    620             run(command => $command, verbose => $verbose);
    621         unless ($success) {
    622             $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
    623             &my_die("Unable to perform laptool -updaterun: $error_code", $lap_id);
    624         }
    625     }
     602
     603    # Do the decision making based on what we've learned
     604    if ($are_warped == $total_exposures) { # Are all the warps done?
     605        if ($defined_fstack == 0) {        # We have not yet made any stacks.
     606            print "STATUS: We can attempt to queue deep final stacks.\n";
     607            my $Nstacks_made = &queue_muggle_finalstack($exposures);
     608            print "STATUS: Made $Nstacks_made final stacks.\n";
     609            exit($Nstacks_made);
     610            # If this doesn't do anything, we may end up stuck here.  Therefore, we need a more robust test.
     611        }
     612        else { # We have made a stack before for this lapRun.
     613            if ($have_fstack == $defined_fstack) { # We have made all the stacks we have asked for (so far)
     614                if ($are_magicked < $total_exposures) { # But we have not yet made diffs
     615                    if (($can_diff == $total_exposures)&& # And we have exposures that should be diffed.
     616                        ($have_diff < $can_diff)) {       # and we haven't made them all yet, either.
     617                        print "STATUS: Dropping unpaired exposures and making pairwise diffs.\n";
     618                        foreach my $exposure (@lonely_exposures) {
     619                            $exposure->{data_state} = 'drop';
     620                            &update_this_exposure($exposure);
     621                        }
     622                        &queue_diffs($exposures);
     623                        exit(0);
     624                    }
     625                    else {
     626                        # This is apparently the case where we've queued diffs to run, but they have not yet
     627                        # completed though the destreak phase.
     628                        print "STATUS: Waiting for diffs/magic/destreak to complete.\n";
     629                        exit(0);
     630                    }
     631                }
     632                elsif ($are_magicked == $total_exposures) { # We have made all of the diffs, and propagated through magic
     633                    print "STATUS: We can create all remaining stacks possible.\n";
     634                    my $Nstacks_made = &queue_magic_finalstack($exposures);
     635                    if ($Nstacks_made == 0) { # We have made all the stacks that we will ever make.
     636                        print "STATUS: No more stacks generated. Deactivating exposures for this complete lapRun.\n";
     637                        &deactivate_exposures($exposures);
     638                        $command = "$laptool -updaterun -lap_id $lap_id";
     639                        $command .= " -dbname $dbname " if defined $dbname;
     640                        $command .= " -set_state full ";
     641                        my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
     642                            run(command => $command, verbose => $verbose);
     643                        unless ($success) {
     644                            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
     645                            &my_die("Unable to perform laptool -updaterun: $error_code", $lap_id);
     646                        }
     647                        exit(0);
     648                    }
     649                    else {
     650                        print "STATUS: $Nstacks_made stacks made.\n";
     651                        exit(0);
     652                    }
     653                }
     654                else { # What?
     655                    print "STATUS: More exposures magicked than exist. This is a mistake.\n";
     656                    exit(0);
     657                }
     658            }
     659            else { # We have not yet made all the stacks we've asked for.
     660                print "STATUS: Defined $defined_fstack, completed $have_fstack. Waiting for stacking to finish.\n";
     661                exit(0);
     662            }
     663        }
     664    }
     665    else { # Not all warps finished.
     666        # do nothing
     667        print "STATUS: Not all warps are finished, waiting for that to finish.\n";
     668        exit(0);
     669    }
     670
    626671    print "STATUS: Exiting\n";
    627672    print "\n";
     
    661706    $command .= " -pretend " if defined $debug;
    662707    $command .= " -dbname $dbname " if defined $dbname;
    663     $command .= " -definebyquery -select_label ${label}% -select_skycell_id ${proj_cell}.% -select_filter $filter ";
     708    $command .= " -definebyquery -select_skycell_id ${proj_cell}.% -select_filter $filter ";
     709#    $command .= " -select_label $label "; # Removed to allow exposure sharing to work
    664710    $command .= " -set_label ${label} -set_data_group $data_group ";
    665711    $command .= "  -set_workdir $workdir  -set_dist_group NODIST ";
     
    673719        &my_die("Unable to perform stacktool -definebyquery: $error_code", $lap_id);
    674720    }
     721    my $stacks_made = $mdcParser->parse_list(join "", @$stdout_buf) or
     722        &my_die("unable to parse metadata from stacktool -definebyquery", $lap_id, "");
    675723
    676724    $command = "$stacktool ";
     
    706754    }
    707755   
    708 
    709 }
    710 sub queue_finalstack {
     756    return($#{ $stacks_made } + 1);
     757}
     758sub queue_muggle_finalstack {
    711759    my $exposures = shift; # reference to exposure array;
    712760    my $exposure = ${ $exposures }[0]; # reference to the first exposure to get run level information
     
    724772    foreach $exposure (@$exposures) {
    725773        if (($exposure->{data_state} ne 'drop')&&
    726             (S64_IS_NOT_NULL($exposure->{magicked}))&&
     774#           (S64_IS_NOT_NULL($exposure->{magicked}))&&
    727775            (S64_IS_NOT_NULL($exposure->{warp_id}))) {
    728776            $warps .= " -warp_id $exposure->{warp_id} ";
     
    741789    $command .= " -pretend " if defined $debug;
    742790    $command .= " -dbname $dbname " if defined $dbname;
    743     $command .= " -definebyquery -select_label ${label}% -select_skycell_id ${proj_cell}.% -select_filter $filter ";
     791    $command .= " -definebyquery -select_skycell_id ${proj_cell}.% -select_filter $filter ";
     792#    $command .= " -select_label $label "; # Removed to allow exposure sharing to work
    744793    $command .= " -set_label ${label} -set_workdir $workdir -set_data_group $data_group ";
    745     $command .= " -min_num 2 -set_reduction THREEPI_STACK -set_dist_group $exposure->{dist_group} ";
     794    $command .= " -min_num ${minimum_stack_inputs} -set_reduction THREEPI_STACK -set_dist_group $exposure->{dist_group} ";
    746795    $command .= " $warps ";
    747796
     
    752801        &my_die("Unable to perform stacktool -definebyquery: $error_code", $lap_id);
    753802    }
    754    
     803    my $stacks_made = $mdcParser->parse_list(join "", @$stdout_buf) or
     804        &my_die("unable to parse metadata from stacktool -definebyquery", $lap_id, "");   
    755805   
    756806    $command = "$stacktool ";
     
    785835    }
    786836
     837    return($#{ $stacks_made } + 1);
     838}
     839sub queue_magic_finalstack {
     840    my $exposures = shift; # reference to exposure array;
     841    my $exposure = ${ $exposures }[0]; # reference to the first exposure to get run level information
     842   
     843    my $lap_id    = $exposure->{lap_id};
     844    my $label     = $exposure->{label};
     845    my $filter    = $exposure->{filter};
     846    my $proj_cell = $exposure->{projection_cell};
     847
     848    unless (defined($label) && defined($filter) && defined($proj_cell)) {
     849        &my_die("Unable to perform stacktool. Insufficient information.", $lap_id);
     850    }
     851
     852    my $warps = '';
     853    foreach $exposure (@$exposures) {
     854        if (($exposure->{data_state} ne 'drop')&&
     855            (S64_IS_NOT_NULL($exposure->{magicked}))&&
     856            (S64_IS_NOT_NULL($exposure->{warp_id}))) {
     857            $warps .= " -warp_id $exposure->{warp_id} ";
     858        }
     859    }
     860
     861    my @utctime = gmtime();
     862    $utctime[5] += 1900;
     863    $utctime[4] += 1;
     864    my $date = sprintf("%4d%02d%02d",$utctime[5],$utctime[4],$utctime[3]);
     865    my $workdir_date = sprintf("%4d/%02d/%02d",$utctime[5],$utctime[4],$utctime[3]);
     866    my $workdir = "neb://\@HOST\@.0/${dbname}/${label}/${workdir_date}";
     867    my $data_group = "${label}.${proj_cell}.final.${date}";
     868
     869    my $command = "$stacktool ";
     870    $command .= " -pretend " if defined $debug;
     871    $command .= " -dbname $dbname " if defined $dbname;
     872    $command .= " -definebyquery -select_skycell_id ${proj_cell}.% -select_filter $filter ";
     873#    $command .= " -select_label $label "; # Removed to allow exposure sharing to work
     874    $command .= " -set_label ${label} -set_workdir $workdir -set_data_group $data_group ";
     875    $command .= " -min_num 2 -min_new 2 -set_reduction THREEPI_STACK -set_dist_group $exposure->{dist_group} ";
     876    $command .= " $warps ";
     877
     878    my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
     879        run(command => $command, verbose => $verbose);
     880    unless ($success) {
     881        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
     882        &my_die("Unable to perform stacktool -definebyquery: $error_code", $lap_id);
     883    }
     884    my $stacks_made = $mdcParser->parse_list(join "", @$stdout_buf) or
     885        &my_die("unable to parse metadata from stacktool -definebyquery", $lap_id, "");   
     886   
     887    $command = "$stacktool ";
     888    $command .= " -dbname $dbname " if defined $dbname;
     889    $command .= " -sassskyfile -data_group $data_group ";
     890    $command .= " -filter $filter -projection_cell ${proj_cell} ";
     891
     892    ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
     893        run(command => $command, verbose => $verbose);
     894    unless ($success) {
     895        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
     896        &my_die("Unable to perform stacktool -sassskyfile: $error_code", $lap_id);
     897    }
     898
     899    my $stacks = $mdcParser->parse_list(join "", @$stdout_buf) or
     900        &my_die("Unable to parse metadata from stacktool -sassskyfile", $lap_id, "");
     901
     902    my $stack = ${ $stacks }[0];
     903    my $sass_id = $stack->{sass_id};
     904    unless (defined($sass_id)) {
     905        &my_die("Unable to parse metadata from stacktool for sass_id", $lap_id, "");
     906    }
     907    print "FINAL_SASS_ID: $sass_id\n";
     908    $command = "$laptool -updaterun -lap_id $lap_id -set_final_sass_id $sass_id";
     909    $command .= " -dbname $dbname " if defined $dbname;
     910
     911    ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
     912        run(command => $command, verbose => $verbose);
     913    unless ($success) {
     914        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
     915        &my_die("Unable to perform laptool -updaterun: $error_code", $lap_id);
     916    }
     917    return($#{ $stacks_made } + 1);
    787918}
    788919sub queue_diffs {
     
    835966            my $companion = ${ $exposures }[$match_hash{$exposure->{chip_id}}];
    836967            $command .= " -definewarpwarp ";
    837             $command .= "-input_label $label -template_label $label ";
     968#           $command .= "-input_label $label -template_label $label ";
    838969            $command .= "-warp_id $exposure->{warp_id} -template_warp_id $companion->{warp_id} ";
    839970            $retry_command = $command;
     
    844975        }
    845976        else { # warp-qstack
    846             $command .= " -definewarpstack -set_reduction NOCONVDIFF -available -good_frac 0.2 ";
    847             $command .= " -warp_id $exposure->{warp_id} -stack_label ${label}.quick ";
    848             $already_queued{$exposure->{warp_id}} = 1;
     977            next; # We no longer wish to make these, and should never get here.
     978            $command .= '-pretend';
     979#           $command .= " -definewarpstack -set_reduction NOCONVDIFF -available -good_frac 0.2 ";
     980#           $command .= " -warp_id $exposure->{warp_id} -stack_label ${label}.quick ";
     981#           $already_queued{$exposure->{warp_id}} = 1;
    849982        }
    850983       
  • tags/ipp-20110622/ippTools/src/laptool.c

    r31482 r31958  
    283283      psMetadataAddStr(where,PS_LIST_TAIL,"rawExp.obs_mode",0,"==","3PI");
    284284    }
    285     pxAddLabelSearchArgs (config, where, "-obsmode", "rawExp.obsmode", "==");
     285    pxAddLabelSearchArgs (config, where, "-obsmode", "rawExp.obs_mode", "==");
    286286  }
    287287 
  • tags/ipp-20110622/ippTools/src/stacktool.c

    r31630 r31958  
    154154    psMetadata *row = output->data[i];
    155155
    156     printf("%" PRId64 " %s %s %s %s\n",psMetadataLookupS64(NULL,row,"sass_id"),
    157            psMetadataLookupStr(NULL,row,"data_group"),
    158            psMetadataLookupStr(NULL,row,"tess_id"),
    159            psMetadataLookupStr(NULL,row,"filter"),
    160            psMetadataLookupStr(NULL,row,"projection_cell"));
     156/*     printf("%" PRId64 " %s %s %s %s\n",psMetadataLookupS64(NULL,row,"sass_id"), */
     157/*            psMetadataLookupStr(NULL,row,"data_group"), */
     158/*            psMetadataLookupStr(NULL,row,"tess_id"), */
     159/*            psMetadataLookupStr(NULL,row,"filter"), */
     160/*            psMetadataLookupStr(NULL,row,"projection_cell")); */
    161161
    162162    if (psMetadataLookupS64(NULL,row,"sass_id") == PS_MAX_S64) {
     
    172172                     psMetadataLookupStr(NULL,row,"projection_cell"));
    173173  }
    174   printf("%" PRId64 " %s %s %s %s\n",psMetadataLookupS64(NULL,outrow,"sass_id"),
    175          psMetadataLookupStr(NULL,outrow,"data_group"),
    176          psMetadataLookupStr(NULL,outrow,"tess_id"),
    177          psMetadataLookupStr(NULL,outrow,"filter"),
    178          psMetadataLookupStr(NULL,outrow,"projection_cell"));
     174/*   printf("%" PRId64 " %s %s %s %s\n",psMetadataLookupS64(NULL,outrow,"sass_id"), */
     175/*          psMetadataLookupStr(NULL,outrow,"data_group"), */
     176/*          psMetadataLookupStr(NULL,outrow,"tess_id"), */
     177/*          psMetadataLookupStr(NULL,outrow,"filter"), */
     178/*          psMetadataLookupStr(NULL,outrow,"projection_cell")); */
    179179
    180180
     
    14811481
    14821482    psMetadata *where = psMetadataAlloc();
    1483     PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "==");
    1484     PXOPT_COPY_S64(config->args, where, "-sass_id", "stackAssociationMap.sass_id", "==");
     1483/*     PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "=="); */
     1484/*     PXOPT_COPY_S64(config->args, where, "-sass_id", "stackAssociationMap.sass_id", "=="); */
    14851485
    14861486    pxAddLabelSearchArgs (config, where, "-label", "stackRun.label", "==");
  • tags/ipp-20110622/ippTools/src/stacktoolConfig.c

    r31630 r31958  
    249249    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
    250250    psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
     251    psMetadataAddS64(pendingcleanuprunArgs, PS_LIST_TAIL, "-stack_id", 0,          "search by stack ID", 0);
     252    psMetadataAddS64(pendingcleanuprunArgs, PS_LIST_TAIL, "-sass_id", 0,          "search by stack association ID", 0);
    251253    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    252254    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
  • tags/ipp-20110622/ippconfig/gpc1/psastro.config

    r31456 r31958  
    347347
    348348LAP_ASTRO METADATA
    349   PSASTRO.CATDIR                STR      3PI.20110505.REFCAT
    350 END
     349#  PSASTRO.CATDIR                STR      3PI.20110505.REFCAT
     350   PSASTRO.CATDIR                STR      PS1.GRIZY
     351END
Note: See TracChangeset for help on using the changeset viewer.