IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28031


Ignore:
Timestamp:
May 19, 2010, 2:11:08 PM (16 years ago)
Author:
eugene
Message:

updates from trunk

Location:
branches/czw_branch/20100427
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • branches/czw_branch/20100427

  • branches/czw_branch/20100427/Ohana

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/czw_branch/20100427/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

    r28017 r28031  
    632632    if (($img_type eq "raw") or ($img_type eq "chip")) {
    633633
    634         my $runs = lookup_runs_by_cam_id_and_coords($ipprc, $imagedb, $img_type,
     634        my $chips = lookup_by_cam_id_and_coords($ipprc, $imagedb, $img_type,
    635635            $ra, $dec, $need_magic, $dateobs_begin, $dateobs_end, $filter, $data_group, $verbose);
    636636
    637         # lookup is going to filter these we don't need to do it here
    638 #        $runs = filterRuns($img_type, $need_magic, $runs, $verbose);
    639         foreach my $run (@$runs) {
    640             next if $component and ($run->{component} ne $component);
    641             my $these_results = lookup($ipprc, $rowList, $imagedb, "byid", $img_type, $run->{id},
    642                 $tess_id, $run->{component}, $need_magic,
    643                 $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $verbose);
    644 
    645             next if !$these_results;
    646             push @$results, @$these_results;
     637        if (!$chips or scalar @$chips == 0) {
     638            setErrorCodes($rowList, $PSTAMP_NO_IMAGE_MATCH);
     639        } else {
     640            foreach my $chip (@$chips) {
     641                next if $component and ($chip->{component} ne $component);
     642                my $these_results = lookup($ipprc, $rowList, $imagedb, "byid", $img_type, $chip->{id},
     643                    $tess_id, $chip->{component}, $need_magic,
     644                    $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $verbose);
     645
     646                next if !$these_results;
     647                push @$results, @$these_results;
     648            }
    647649        }
    648650       
    649651    } else {
    650         # this should be checked elsewhere
     652        # this should have been checked elsewhere
    651653        die "unexpected image type $img_type" if ($img_type ne "warp")
    652654                                              and ($img_type ne "stack") and ($img_type ne "diff");
    … …  
    654656        my $skycells = lookup_skycell_by_coords($ipprc, $tess_id, $component, $ra, $dec, $verbose);
    655657
    656         foreach my $skycell (@$skycells) {
    657             my $these_results = lookup($ipprc, $rowList, $imagedb, "byskycell", $img_type, undef,
    658                 $skycell->{tess_id}, $skycell->{component}, $need_magic,
    659                 $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $verbose);
    660 
    661             next if !$these_results;
    662             push @$results, @$these_results;
     658        if (!$skycells or scalar @$skycells == 0) {
     659            setErrorCodes($rowList, $PSTAMP_NO_IMAGE_MATCH);
     660        } else {
     661            foreach my $skycell (@$skycells) {
     662                my $these_results = lookup($ipprc, $rowList, $imagedb, "byskycell", $img_type, undef,
     663                    $skycell->{tess_id}, $skycell->{component}, $need_magic,
     664                    $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $verbose);
     665
     666                next if !$these_results;
     667                push @$results, @$these_results;
     668            }
    663669        }
    664670    }
    … …  
    667673}
    668674
    669 # lookup_runs_by_cam_id_and_coords
    670 # given an ra, dec, and optionally other paramters, find camera runs for exposures
     675# lookup__by_cam_id_and_coords
     676# given an ra, dec, and optionally other parameters, find camera runs for exposures
    671677# that are within some distance of the coordinates
    672 sub lookup_runs_by_cam_id_and_coords {
     678
     679sub lookup_by_cam_id_and_coords {
    673680    my $ipprc      = shift;
    674681    my $imagedb   = shift;
    … …  
    686693
    687694    {
     695        my $search_radius = 1.6; # XXX: this should be camera specific
     696
    688697        my $command = "$camtool -dbname $imagedb -processedexp -pstamp_order";
    689            $command .= " -ra $ra -decl $dec -radius 1.6";
     698           $command .= " -ra $ra -decl $dec -radius $search_radius";
    690699           $command .= " -dateobs_begin $dateobs_begin" if $dateobs_begin;
    691700           $command .= " -dateobs_end   $dateobs_end"   if $dateobs_end  ;
    … …  
    693702           # NOTE: we are applying the data_group to the camera run.
    694703           # If we're looking for chip stage images there is no guarentee that
    695            # chipRun.data_group = camRun.data_group. In practice this is almost
     704           # chipRun.data_group eq camRun.data_group. In practice this is almost
    696705           # always the case. If this turns out to be a problem we can defer
    697706           # the data_group test to when we look up the chipProcessedImfiles
    … …  
    705714        return undef;
    706715    }
    707     my $runs;
     716    my $components;
    708717    my $last_exp_id = 0;
    709718    foreach my $camRun (@$camruns) {
    … …  
    774783
    775784        # build the hash to return
    776         my $run = {
     785        # XXX: very few of the entries in this hash are currently used.
     786        # Used are: id, component
     787        # I had plans to use it for the camRun lookup optimization, but the cache solves the
     788        # problem
     789        my $comp = {
    777790            exp_id    => $camRun->{exp_id},
    778791            exp_name  => $camRun->{exp_name},
    779792            chip_id   => $camRun->{chip_id},
    780793            cam_id    => $camRun->{cam_id},
    781             astrom    => $astrom_resolved,  # XXX: is astrom used?
    782794            class_id  => $class_id,
    783795            component => $class_id
    784796        };
    785797        if ($img_type eq "chip") {
    786             $run->{id} = $camRun->{chip_id};
    787             $run->{state} = $camRun->{chip_state};
    788             $run->{magicked} = $camRun->{chip_magicked};
    789         } else {
    790             $run->{id} = $camRun->{exp_id};
    791             $run->{state} = 'full';
    792             $run->{magicked} = $camRun->{raw_magicked};
    793         }
    794         push @$runs, $run;
    795     }
    796 
    797     return $runs;
     798            $comp->{id} = $camRun->{chip_id};
     799            $comp->{state} = $camRun->{chip_state};
     800            $comp->{magicked} = $camRun->{chip_magicked};
     801        } else {
     802            $comp->{id} = $camRun->{exp_id};
     803            $comp->{state} = 'full';
     804            $comp->{magicked} = $camRun->{raw_magicked};
     805        }
     806        push @$components, $comp;
     807    }
     808
     809    return $components;
    798810}
    799811

  • branches/czw_branch/20100427/ippScripts/scripts/chip_imfile.pl

    r27718 r28031  
    7676    defined $run_state;
    7777
     78my_die ("$run_state is an invalid value for run-state", $exp_id, $chip_id, $class_id, $PS_EXIT_PROG_ERROR) unless ($run_state eq 'new' or $run_state eq 'update');
     79
    7880my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
    7981
    … …  
    201203
    202204        my $burntoolStateGood;
     205        my $burntoolStateGoodUpdate;
    203206        foreach my $camEntry (@$camData) {
    204207            if ($camEntry->{name} eq "BURNTOOL.STATE.GOOD") {
    205208                $burntoolStateGood = $camEntry->{value};
    206209            }
    207         }
    208 
    209         print "burntool state vs burntoolStateGood : $burntoolState vs $burntoolStateGood\n";
     210            if ($camEntry->{name} eq "BURNTOOL.STATE.GOOD.UPDATE") {
     211                $burntoolStateGoodUpdate = $camEntry->{value};
     212            }
     213        }
     214
     215        if ($run_state eq 'new') {
     216            print "burntool state vs burntoolStateGood : $burntoolState vs $burntoolStateGood\n";
     217        } else {
     218            # if doing update go ahead if burntoolState is at least at BURNTOOL.STATE.GOOD.UPDATE
     219            print "burntool state vs burntoolStateGoodUpdate : $burntoolState vs $burntoolStateGoodUpdate\n";
     220            $useBestBurntool = 0 if (abs($burntoolState) >= $burntoolStateGoodUpdate);
     221        }
     222
    210223        if (abs($burntoolState) != $burntoolStateGood) {
    211224            if ($useBestBurntool) {

  • branches/czw_branch/20100427/ippToPsps/config/detection/tables.xml

    r28017 r28031  
    163163    <column name="projectionCellID" type="TLONG" default="-999" comment="projection cell identifier at discovery time"></column>
    164164    <column name="dataRelease" type="TBYTE" default="0" comment="Data release to propagate to the object"></column>
     165    <column name="surveyID" type="TBYTE" default="255" comment="surveyID &lt;/coluumn&gt;"></column>
    165166  </table>
    166167  <table name="ObjectCalColor">

  • branches/czw_branch/20100427/ippToPsps/scripts/convertPhotCodesToXml.pl

    r28017 r28031  
    5252        my $photCode = $columns[1];
    5353        my $zeroPoint = $columns[4];
     54        my $extinction = $columns[5];
    5455
    5556        $writer->startTag('row',
    … …  
    5960                "AB" => "0.0", # TODO
    6061                "zeropoint" => $zeroPoint,
    61                 "extinction" => "0.0", # TODO
     62                "extinction" => $extinction,
    6263                "colorterm" => "0.0", # TODO
    6364                "colorExtn" => "0.0", # TODO

  • branches/czw_branch/20100427/ippToPsps/scripts/ippToPsps_run.pl

    r28017 r28031  
    1616# TODO temporary until we use database to store current jobid
    1717my $jobIdFilePath = "./config/currentJobId.txt";
     18my $logFile = "./config/logfile.txt";
    1819
    1920# default values for certain globals
    … …  
    2728$singleExpId = undef;
    2829$datastoreProduct = "PSPS_test";
     30
    2931
    3032# get user args
    … …  
    166168    $query->execute;
    167169
     170    open (LOGFILE, ">> $logFile");
     171
    168172    # loop round exposures
    169173    while (my @row = $query->fetchrow_array()) {
    … …  
    215219                }
    216220
     221                # write to the log
     222                print LOGFILE "$jobId $expId\n";
     223
    217224                $jobId++;
    218225                $batchId = 0;
    … …  
    232239
    233240    $db->disconnect();
     241    close (LOGFILE);
    234242
    235243    return 1;

  • branches/czw_branch/20100427/ippToPsps/src/ippToPspsBatchDetection.c

    r28017 r28031  
    336336            fits_write_col(this->fitsOut, TLONGLONG, SKINNYOBJECT_OBJID, 1, 1, nDet, objID, &status);
    337337            fits_write_col(this->fitsOut, TLONGLONG, SKINNYOBJECT_IPPOBJID, 1, 1, nDet, ippObjID, &status);
     338            fits_write_col(this->fitsOut, TBYTE, SKINNYOBJECT_SURVEYID, 1, 1, nDet, surveyIDs, &status);
    338339            if (numOfDuplicates||numInvalidFlux) fits_delete_rowlist(this->fitsOut, removeList, numOfDuplicates+numInvalidFlux, &status);
    339340

  • branches/czw_branch/20100427/ippToPsps/src/ippToPspsDetEnums.h

    r28017 r28031  
    167167  SKINNYOBJECT_PROJECTIONCELLID = 3,
    168168  SKINNYOBJECT_DATARELEASE = 4,
     169  SKINNYOBJECT_SURVEYID = 5,
    169170} SkinnyObject;
    170171

  • branches/czw_branch/20100427/ippTools/share/chiptool_setimfiletoupdate.sql

    r27391 r28031  
    11UPDATE chipRun
    22    JOIN chipProcessedImfile USING(chip_id)
     3    LEFT JOIN magicDSRun ON (stage_id = chip_id AND stage = 'chip')
     4    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     5                              AND component = class_id)
    36SET chipRun.state = 'update',
    47    chipProcessedImfile.data_state = 'update'
    … …  
    710    AND (chipRun.state = 'cleaned' OR chipRun.state = 'update')
    811    AND (chipProcessedImfile.data_state = 'cleaned')
     12    -- don't queue update if the associated magicDSFile exists
     13    AND (chipRun.magicked = 0
     14      OR (magicDSRun.state = 'cleaned' OR magicDSRun.state = 'new')
     15            AND magicDSFile.component IS NULL)

  • branches/czw_branch/20100427/ippTools/share/difftool_setskyfiletoupdate.sql

    r28017 r28031  
    11UPDATE diffRun
    22    JOIN diffSkyfile USING(diff_id)
     3    LEFT JOIN magicDSRun ON (stage_id = diff_id AND stage = 'diff')
     4    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     5                              AND component = skycell_id)
    36SET diffRun.state = 'update',
    47    diffSkyfile.data_state = 'update'
    … …  
    710    AND (diffRun.state = 'cleaned' OR diffRun.state = 'update')
    811    AND (diffSkyfile.data_state = 'cleaned')
     12    -- don't queue update if the associated magicDSFile still exists
     13    AND (diffRun.magicked = 0
     14      OR (magicDSRun.state = 'cleaned' OR magicDSRun.state = 'new')
     15            AND magicDSFile.component IS NULL)

  • branches/czw_branch/20100427/ippTools/share/warptool_setskyfiletoupdate.sql

    r27737 r28031  
    11UPDATE warpRun
    22    JOIN warpSkyfile USING(warp_id)
     3    LEFT JOIN magicDSRun ON (stage_id = warp_id AND stage = 'warp')
     4    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     5                              AND component = skycell_id)
    36SET warpRun.state = 'update',
    47    warpSkyfile.data_state = 'update'
    … …  
    710    AND (warpRun.state = 'cleaned' OR warpRun.state = 'update')
    811    AND (warpSkyfile.data_state = 'cleaned')
     12    AND (warpRun.magicked = 0
     13      OR (magicDSRun.state = 'cleaned' OR magicDSRun.state = 'new')
     14      AND magicDSFile.component IS NULL)

  • branches/czw_branch/20100427/ippconfig

  • branches/czw_branch/20100427/ippconfig/gpc1/camera.config

    r28017 r28031  
    150150PHOTCODE.RULE           STR     {DETECTOR}.{FILTER.ID}.{CHIP.NAME}      # Rule for generating photcode
    151151
    152 BURNTOOL.STATE.GOOD     S16     14  # Value for burntool_state with the most recent bt version.
     152BURNTOOL.STATE.GOOD        S16  14  # Value for burntool_state with the most recent bt version.
     153BURNTOOL.STATE.GOOD.UPDATE S16  13  # for upddate processing accept earlier version
     154
    153155FOV                     F32     15000
    154156NPIX_INTERCHIP          S32     0

  • branches/czw_branch/20100427/ippconfig/recipes/filerules-split.mdc

    r28017 r28031  
    155155PPIMAGE.CHIP.VARIANCE        OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits   VARIANCE        COMP_WT    CHIP       TRUE      NONE
    156156PPIMAGE.CHIP.RESID           OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE           NONE       CHIP       TRUE      NONE
    157                                                                                                              
     157PPIMAGE.CHIP.UNCOMPRESSED    OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE           NONE       CHIP       TRUE      NONE
     158
    158159PPIMAGE.OUTPUT.FPA1          OUTPUT {OUTPUT}.b1.fits                  IMAGE           NONE       FPA        TRUE      NONE
    159160PPIMAGE.OUTPUT.FPA2          OUTPUT {OUTPUT}.b2.fits                  IMAGE           NONE       FPA        TRUE      NONE
    … …  
    229230PSWARP.BIN2                  OUTPUT {OUTPUT}.b2.fits                  IMAGE           NONE       FPA        TRUE      NONE
    230231PSWARP.CONFIG                OUTPUT {OUTPUT}.pswarp.mdc               TEXT            NONE       FPA        TRUE      NONE
    231                                                                                                              
     232PSWARP.OUTPUT.UNCOMPRESSED   OUTPUT {OUTPUT}.fits                     IMAGE           NONE       FPA        TRUE      NONE
     233                                                                                                   
    232234SKYCELL.STATS                OUTPUT {OUTPUT}.stats                    STATS           NONE       FPA        TRUE      NONE
    233235SKYCELL.TEMPLATE             OUTPUT {OUTPUT}.skycell                  SKYCELL         NONE       FPA        TRUE      NONE

  • branches/czw_branch/20100427/ippconfig/recipes/psphot.config

    r28017 r28031  
    342342# Recipe overrides for DIFF
    343343DIFF    METADATA
     344  OUTPUT.FORMAT         STR   PS1_DV1
    344345END
    345346

  • branches/czw_branch/20100427/ppSim

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/czw_branch/20100427/ppViz/src/ppVizPattern/ppVizPatternLoop.c

    r26842 r28031  
    8080                }
    8181
     82                // Remove bias sections to avoid warnings
     83                psMetadataItem *biassec = psMetadataLookup(readout->parent->concepts, "CELL.BIASSEC");
     84                if (psListLength(biassec->data.V)) {
     85                    psFree(biassec->data.V);
     86                    biassec->data.V = psListAlloc(NULL);
     87                }
     88
    8289                readout->data_exists = true;
    8390                readout->parent->data_exists = true;

  • branches/czw_branch/20100427/pstamp/scripts/pstampparse.pl

    r28017 r28031  
    521521    my $dep_id;
    522522
    523     # XXX: this code is repeated in queueGetImageJobs we should encapsulate it in a subroutine and share it
    524     if ($stage ne 'raw') {
    525         # updates for stack stage not supported yet
    526         my $allow_wait_for_update = ($stage ne 'stack');
    527         my $run_state = $image->{state};
    528         my $data_state = $image->{data_state};
    529         $data_state = $run_state if $stage eq 'stack';
    530         if (($run_state eq 'goto_purged') or ($data_state eq 'purged') or
    531             ($run_state eq 'drop') or
    532             ($run_state eq 'error_cleaned') or ($data_state eq 'error_cleaned') or
    533             ($run_state eq 'goto_scrubbed') or ($data_state eq 'scrubbed')) {
    534             # image is gone and it's not coming back
    535             $newState = 'stop';
    536             $fault = $PSTAMP_GONE;
    537         } elsif (($data_state ne 'full') or ($need_magic and ($image->{magicked} < 0))) {
    538             if ($stage eq 'chip') {
    539                 my $burntool_state = $image->{burntool_state};
    540                 if ($burntool_state and (abs($burntool_state) < 14)) {
    541                     $newState = 'stop';
    542                     $fault = $PSTAMP_NOT_AVAILABLE;
    543                 }
    544             }
    545             if (!$allow_wait_for_update) {
    546                 print STDERR "wait for update not supported for stage $stage yet\n";
    547                 $newState = 'stop';
    548                 $fault = $PSTAMP_NOT_AVAILABLE;
    549             }
    550             if (!$fault) {
    551                 # wait for update unless the customer asks us not to
    552                 if (($option_mask & $PSTAMP_NO_WAIT_FOR_UPDATE)) {
    553                     $newState = 'stop';
    554                     $fault = $PSTAMP_NOT_AVAILABLE;
    555                 } elsif (!$image->{magicked}) {
    556                     $newState = 'stop';
    557                     $fault = $PSTAMP_NOT_DESTREAKED;
    558                 } else {
    559                     # cause the image to be re-made
    560                     # set up to queue an update run
    561                     queue_update_run(\$newState, \$fault, \$dep_id, $image->{imagedb},
    562                         $run_state, $stage, $image->{stage_id}, $image->{component}, $need_magic);
    563                 }
    564             }
    565         }
    566     }
     523    queueUpdatesIfNeeded($stage, $image, $option_mask, \$newState, \$fault, \$dep_id);
    567524
    568525    my $command = "$pstamptool -addjob  -req_id $req_id -job_type $row->{JOB_TYPE}"
    … …  
    704661        my $dep_id;
    705662
    706         if ($stage ne 'raw') {
    707             my $run_state = $image->{state};
    708             my $data_state = $image->{data_state};
    709             $data_state = $run_state if $stage eq "stack";
    710             if (($run_state eq 'goto_purged') or ($data_state eq 'purged') or
    711                 ($run_state eq 'goto_scrubbed') or ($data_state eq 'scrubbed')) {
    712                 # image is gone and it's not coming back
    713                 $newState = 'stop';
    714                 $fault = $PSTAMP_GONE;
    715             } elsif (($data_state ne 'full') or ($need_magic and ($image->{magicked} < 0))) {
    716                 # wait for update unless the customer asks us to not to
    717                 if ($option_mask & $PSTAMP_NO_WAIT_FOR_UPDATE) {
    718                     $newState = 'stop';
    719                     $fault = $PSTAMP_NOT_AVAILABLE;
    720                 } else {
    721                     # cause the image to be re-made
    722                     # set up to queue an update run
    723                     queue_update_run(\$newState, \$fault, \$dep_id, $image->{imagedb},
    724                         $run_state, $stage, $image->{stage_id}, $image->{component}, $need_magic);
    725                 }
    726             }
    727         }
     663        queueUpdatesIfNeeded($stage, $image, $option_mask, \$newState, \$fault, \$dep_id);
    728664
    729665        $num_jobs++;
    … …  
    864800}
    865801
    866 sub queue_update_run
     802sub get_dependent
    867803{
    868804    my ($r_jobState, $r_fault, $r_dep_id, $imagedb, $state, $stage, $stage_id, $component, $need_magic) = @_;
    869805
    870     # XXX: The update process for warp and subsequent stages requires
    871     # destreaking to run because the -pending queries require it when magicked > 0
    872     # queries.
    873     # The case of stack-stack diffs is taken care of in pstamp_checkdependent
     806    # XXX: The update process for warp and subsequent stages requires # destreaking to be performed
     807    # because the -pending queries require the inputs to have magicked >= 0
     808    # The case of stack-stack diffs not needing to be destreaked is taken care of in pstamp_checkdependent
    874809    $need_magic = 1 if $imagedb eq 'gpc1';
    875810
    876     if (($state ne 'cleaned') and ($state ne 'update') and ($state ne 'goto_cleaned')) {
     811    # chipRun's can be in full state if destreaking is necessary
     812    if (($state ne 'cleaned') and ($state ne 'update') and ($state ne 'goto_cleaned') and
     813        ($stage eq 'chip' and $state eq 'full')) {
    877814        my_die("$stage $stage_id is in unexpected state $state", $PS_EXIT_PROG_ERROR);
    878815    }
    … …  
    910847}
    911848
     849sub queueUpdatesIfNeeded {
     850    my $stage = shift;
     851    my $image = shift;
     852    my $option_mask = shift;
     853    my $r_newState = shift;
     854    my $r_fault = shift;
     855    my $r_dep_id = shift;
     856
     857    if ($stage ne 'raw') {
     858        my $run_state = $image->{state};
     859        my $data_state = $image->{data_state};
     860        $data_state = $run_state if $stage eq 'stack';
     861        if (($run_state =~ /purged/) or ($run_state =~ /scrubbed/) or ($run_state eq 'drop')) {
     862            # image is gone and it's not coming back
     863            $$r_newState = 'stop';
     864            $$r_fault = $PSTAMP_GONE;
     865        } elsif (($run_state eq "error_cleaned") or ($data_state eq 'error_cleaned')) {
     866            # if cleanup had an error don't get the user's hopes up set fault to gone
     867            $$r_newState = 'stop';
     868            $$r_fault = $PSTAMP_GONE;
     869        } elsif (($data_state ne 'full') or ($need_magic and ($image->{magicked} < 0))) {
     870   
     871            if ($stage eq 'stack') {
     872                print STDERR "Stamps cannot be made from cleaned stacks.\n";
     873                $$r_newState = 'stop';
     874                $$r_fault = $PSTAMP_GONE;
     875            }
     876            if (!$$r_fault) {
     877                # wait for update unless the customer asks us not to
     878                if (($option_mask & $PSTAMP_NO_WAIT_FOR_UPDATE)) {
     879                    $$r_newState = 'stop';
     880                    $$r_fault = $PSTAMP_NOT_AVAILABLE;
     881                } elsif (!$image->{magicked}) {
     882                    $$r_newState = 'stop';
     883                    $$r_fault = $PSTAMP_NOT_DESTREAKED;
     884                } else {
     885                    # cause the image to be re-made
     886                    # set up to queue an update run
     887                    get_dependent(\$$r_newState, \$$r_fault, $r_dep_id, $image->{imagedb},
     888                        $run_state, $stage, $image->{stage_id}, $image->{component}, $need_magic);
     889                }
     890            }
     891        }
     892    }
     893}
     894
    912895sub write_params {
    913896    my $output_base = shift;

  • branches/czw_branch/20100427/pswarp/src/pswarpLoop.c

    r28017 r28031  
    292292        psFree(covar);
    293293
    294         psImageCovarianceTransfer(output->variance, output->covariance);
     294        if (output->variance) {
     295            psImageCovarianceTransfer(output->variance, output->covariance);
     296        }
    295297    }
    296298

  • branches/czw_branch/20100427/tools/czartool.pl

    r28017 r28031  
    234234        foreach $distLabel (@distributionLabels) {
    235235            chomp($stdsLabel);
     236            chomp($distLabel);
    236237            if ($stdsLabel eq $distLabel) { $distributing = 1; last;}
    237238
Note: See TracChangeset for help on using the changeset viewer.