IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28536 for trunk


Ignore:
Timestamp:
Jun 28, 2010, 8:13:53 PM (16 years ago)
Author:
Paul Price
Message:

Merging background restoration branch.

Location:
trunk
Files:
20 edited
4 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/Ohana

  • trunk/ippScripts/scripts/background_chip.pl

    r28486 r28536  
    144144my $out_image = $ipprc->filename("PPBACKGROUND.OUTPUT", $outroot, $class_id);
    145145my $out_mask = $ipprc->filename("PPBACKGROUND.OUTPUT.MASK", $outroot, $class_id);
    146 my $out_stats = $ipprc->filename("PPIMAGE.STATS", $outroot, $class_id);
    147 my $out_config = $ipprc->filename("PPIMAGE.CONFIG", $outroot, $class_id);
     146my $out_stats = $ipprc->filename("PPBACKGROUND.STATS", $outroot, $class_id);
     147my $out_config = $ipprc->filename("PPBACKGROUND.CONFIG", $outroot, $class_id);
    148148my $traceDest = $ipprc->filename("TRACE.IMFILE", $outroot, $class_id);
    149149

  • trunk/ippScripts/scripts/dist_advancerun.pl

    r27718 r28536  
    6666my $difftool   = can_run('difftool') or (warn "Can't find difftool" and $missing_tools = 1);
    6767my $stacktool   = can_run('stacktool') or (warn "Can't find stacktool" and $missing_tools = 1);
     68my $bgtool = can_run('bgtool') or (warn "Can't find bgtool" and $missing_tools = 1);
    6869if ($missing_tools) {
    6970    &my_die("Can't find required tools.", $dist_id, $PS_EXIT_CONFIG_ERROR);
    … …  
    8283    $tool_cmd = "$chiptool -chip_id";
    8384    $list_mode = "-processedimfile";
     85    $component_key = "class_id";
     86} elsif ($stage eq "chip_bg") {
     87    $tool_cmd = "$bgtool -chip_bg_id";
     88    $list_mode = "-chip";
    8489    $component_key = "class_id";
    8590} elsif ($stage eq "camera") {
    … …  
    9499    $tool_cmd = "$warptool -warp_id";
    95100    $list_mode = "-warped";
     101    $component_key = "skycell_id";
     102} elsif ($stage eq "warp_bg") {
     103    $tool_cmd = "$bgtool -warp_bg_id";
     104    $list_mode = "-warp";
    96105    $component_key = "skycell_id";
    97106} elsif ($stage eq "stack") {

  • trunk/ippScripts/scripts/dist_bundle.pl

    r27718 r28536  
    3535                     'PPIMAGE.CHIP.MASK' => 'mask',
    3636                     'PPIMAGE.CHIP.VARIANCE' => 'variance' );
     37my %chip_bg_cleaned = ( 'PPBACKGROUND.OUTPUT' => 'image',
     38                        'PPBACKGROUND.OUTPUT.MASK' => 'mask' );
    3739my %camera_cleaned = ( 'PSASTRO.OUTPUT.MASK' => 'mask' );
    3840my %fake_cleaned;
    … …  
    4042                     'PSWARP.OUTPUT.MASK' => 'mask',
    4143                     'PSWARP.OUTPUT.VARIANCE' => 'variance' );
     44my %warp_bg_cleaned = ( 'PSWARP.OUTPUT' => 'image',
     45                        'PSWARP.OUTPUT.MASK' => 'mask' );
    4246my %diff_cleaned = ( 'PPSUB.OUTPUT' => 'image',
    4347                     'PPSUB.OUTPUT.MASK' => 'mask',
    … …  
    246250        my $fh = open_with_retries($mask_resolved);
    247251        close $fh;
    248     } elsif ($stage eq "chip") {
     252    } elsif ($stage eq "chip" or $stage eq "chip_bg") {
    249253        $class_id = $component;
    250254    }
    … …  
    416420    if ($stage eq "chip") {
    417421        $config_file_rule = "PPIMAGE.CONFIG";
     422    } elsif ($stage eq "chip") {
     423        $config_file_rule = "PPBACKGROUND.CONFIG";
    418424    } elsif ($stage eq "camera") {
    419425        $config_file_rule = "PSASTRO.CONFIG";
    … …  
    422428        return \@file_list;
    423429    } elsif ($stage eq "warp") {
     430        $config_file_rule = "PSWARP.CONFIG";
     431    } elsif ($stage eq "warp_bg") {
    424432        $config_file_rule = "PSWARP.CONFIG";
    425433    } elsif ($stage eq "diff") {

  • trunk/ippScripts/scripts/dist_defineruns.pl

    r27718 r28536  
    8383    push @stages, $stage;
    8484} else {
    85     @stages = qw( raw chip camera fake warp diff stack SSdiff);
     85    @stages = qw( raw chip chip_bg camera fake warp warp_bg diff stack SSdiff);
    8686}
    8787

  • trunk/ippScripts/scripts/dist_make_fileset.pl

    r27718 r28536  
    239239    } elsif ($stage eq 'chip') {
    240240        $query = "SELECT exp_name FROM chipRun JOIN rawExp USING(exp_id) WHERE chip_id = $stage_id";
     241    } elsif ($stage eq 'chip_bg') {
     242        $query = "SELECT exp_name FROM chipBackgroundRun JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) WHERE chip_bg_id = $stage_id";
    241243    } elsif ($stage eq 'camera') {
    242244        $query = "SELECT exp_name FROM camRun JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id)"
    … …  
    248250        $query = "SELECT exp_name FROM warpRun JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id)"
    249251                    . " JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) WHERE warp_id = $stage_id";
     252    } elsif ($stage eq 'warp_bg') {
     253        $query = "SELECT exp_name FROM warpBackgroundRun JOIN warpRun USING(warp_id) JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) WHERE warp_bg_id = $stage_id";
    250254    } else {
    251255        &my_die("$stage is invalid value for stage\n");

  • trunk/ippScripts/scripts/magic_destreak.pl

    r27957 r28536  
    9797my ($skycell_args, $class_id, $skycell_id);
    9898
    99 if (($stage eq "raw") or ($stage eq "chip")) {
     99if (($stage eq "raw") or ($stage eq "chip") or $stage eq "chip_bg") {
    100100    $class_id = $component;
    101101    $skycell_args = " -class_id $component";
    102 } elsif ($stage eq "warp") {
     102} elsif ($stage eq "warp" or $stage eq "warp_bg") {
    103103    $skycell_id = $component;
    104104    $skycell_args = " -skycell_id $component";
    … …  
    286286        # $sources = $ipprc->filename("PSPHOT.OUT.CMF.SPL",  $path_base);
    287287
    288     } elsif ($stage eq "warp") {
     288    } elsif ($stage eq "chip_bg") {
     289        $image  = $ipprc->filename("PPBACKGROUND.OUTPUT", $path_base, $class_id);
     290        $mask = $ipprc->filename("PPBACKGROUND.OUTPUT.MASK", $path_base, $class_id);
     291        $astrom = $ipprc->filename("PSASTRO.OUTPUT", $cam_path_base);
     292    } elsif ($stage eq "warp" or $stage eq "warp_bg") {
    289293        $image  = $ipprc->filename("PSWARP.OUTPUT", $path_base);
    290294        $mask   = $ipprc->filename("PSWARP.OUTPUT.MASK", $path_base);

  • trunk/ippTools/share/Makefile.am

    r28486 r28536  
    145145        disttool_definebyquery_camera.sql \
    146146        disttool_definebyquery_chip.sql \
     147        disttool_definebyquery_chip_bg.sql \
    147148        disttool_definebyquery_diff.sql \
    148149        disttool_definebyquery_fake.sql \
    … …  
    150151        disttool_definebyquery_stack.sql \
    151152        disttool_definebyquery_warp.sql \
     153        disttool_definebyquery_warp_bg.sql \
    152154        disttool_definebyquery_SSdiff.sql \
    153155        disttool_defineinterest.sql \
    … …  
    228230        magicdstool_definebyquery_raw.sql \
    229231        magicdstool_definebyquery_chip.sql \
     232        magicdstool_definebyquery_chip_bg.sql \
    230233        magicdstool_definebyquery_camera.sql \
    231234        magicdstool_definebyquery_warp.sql \
     235        magicdstool_definebyquery_warp_bg.sql \
    232236        magicdstool_definebyquery_diff.sql \
    233237        magicdstool_definecopy_chip.sql \

  • trunk/ippTools/src/disttool.c

    r28270 r28536  
    210210            psStringAppend(&query, " AND (chipRun.dist_group = '%s')", dist_group);
    211211        }
     212    } else if (!strcmp(stage, "chip_bg")) {
     213        magicRunType = "chipBackgroundRun";
     214        runJoinStr = "chipBackgroundRun.chip_bg_id";
     215        query = pxDataGet("disttool_definebyquery_chip_bg.sql");
     216        if (!query) {
     217            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
     218            psFree(where);
     219            return false;
     220        }
     221
     222        if (label) {
     223            psStringAppend(&query, " AND (chipBackgroundRun.label = '%s')", label);
     224        }
     225        if (dist_group) {
     226            psStringAppend(&query, " AND (chipBackgroundRun.dist_group = '%s')", dist_group);
     227        }
    212228    } else if (!strcmp(stage, "camera")) {
    213229        magicRunType = "camRun";    // This is used below to set the magicked business
    … …  
    258274        if (dist_group) {
    259275            psStringAppend(&query, " AND (warpRun.dist_group = '%s')", dist_group);
     276        }
     277
     278    } else if (!strcmp(stage, "warp_bg")) {
     279        magicRunType = "warpBackgroundRun";
     280        runJoinStr = "warpBackgroundRun.warp_bg_id";
     281        query = pxDataGet("disttool_definebyquery_warp_bg.sql");
     282        if (!query) {
     283            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
     284            psFree(where);
     285            return false;
     286        }
     287
     288        if (label) {
     289            psStringAppend(&query, " AND (warpBackgroundRun.label = '%s')", label);
     290        }
     291        if (dist_group) {
     292            psStringAppend(&query, " AND (warpBackgroundRun.dist_group = '%s')", dist_group);
    260293        }
    261294

  • trunk/ippTools/src/magicdstool.c

    r27786 r28536  
    122122    PXOPT_COPY_S64(config->args, where, "-exp_id",  "exp_id", "==");
    123123    PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "==");
     124    PXOPT_COPY_S64(config->args, where, "-chip_bg_id", "chip_bg_id", "==");
    124125    PXOPT_COPY_S64(config->args, where, "-cam_id",  "cam_id", "==");
    125126    PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
     127    PXOPT_COPY_S64(config->args, where, "-warp_bg_id", "warp_bg_id", "==");
    126128    PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "==");
    127129    PXOPT_COPY_S64(config->args, where, "-magic_id","magicRun.magic_id", "==");
    … …  
    140142        query = pxDataGet("magicdstool_definebyquery_chip.sql");
    141143        break;
     144    case IPP_STAGE_CHIP_BG:
     145        query = pxDataGet("magicdstool_definebyquery_chip_bg.sql");
     146        break;
    142147    case IPP_STAGE_CAMERA:
    143148        query = pxDataGet("magicdstool_definebyquery_camera.sql");
    … …  
    145150    case IPP_STAGE_WARP:
    146151        query = pxDataGet("magicdstool_definebyquery_warp.sql");
     152        break;
     153    case IPP_STAGE_WARP_BG:
     154        query = pxDataGet("magicdstool_definebyquery_warp_bg.sql");
    147155        break;
    148156    case IPP_STAGE_DIFF:
    … …  
    720728        query = "UPDATE chipProcessedImfile SET magicked = %" PRId64 " where chip_id = %" PRId64 " AND class_id = '%s'";
    721729        break;
     730    case IPP_STAGE_CHIP_BG:
     731        query = "UPDATE chipBackgroundImfile SET magicked = %" PRId64 " where chip_bg_id = %" PRId64 " AND class_id = '%s'";
     732        break;
    722733    case IPP_STAGE_CAMERA:
    723734        // no there is no magicked column in camProcessedExp so we have nothing to do
    … …  
    727738        query = "UPDATE warpSkyfile SET magicked = %" PRId64 " where warp_id = %" PRId64 " AND skycell_id = '%s'";
    728739        break;
     740    case IPP_STAGE_WARP_BG:
     741        query = "UPDATE warpBackgroundSkyfile SET magicked = %" PRId64 " where warp_bg_id = %" PRId64 " AND skycell_id = '%s'";
     742        break;
    729743    case IPP_STAGE_DIFF:
    730744        query = "UPDATE diffSkyfile SET magicked = %" PRId64 " where diff_id = %" PRId64 " AND skycell_id = '%s'";
    … …  
    794808        query = "UPDATE chipRun SET magicked = %" PRId64 " where chip_id = %" PRId64;
    795809        break;
     810    case IPP_STAGE_CHIP_BG:
     811        query = "UPDATE chipBackgroundRun SET magicked = %" PRId64 " where chip_bg_id = %" PRId64;
     812        break;
    796813    case IPP_STAGE_CAMERA:
    797814        query = "UPDATE camRun SET magicked = %" PRId64 " where cam_id = %" PRId64;
    … …  
    799816    case IPP_STAGE_WARP:
    800817        query = "UPDATE warpRun SET magicked = %" PRId64 " where warp_id = %" PRId64;
     818        break;
     819    case IPP_STAGE_WARP_BG:
     820        query = "UPDATE warpBackgroundRun SET magicked = %" PRId64 " where warp_bg_id = %" PRId64;
    801821        break;
    802822    case IPP_STAGE_DIFF:

  • trunk/ippTools/src/magicdstoolConfig.c

    r27452 r28536  
    6060    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id",   0, "search by exp_id", 0);
    6161    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-chip_id",  0, "search by chip_id", 0);
     62    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-chip_bg_id",  0, "search by chip_bg_id", 0);
    6263    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-cam_id",  0, "search by cam_id", 0);
    6364    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_id",  0, "search by warp_id", 0);
     65    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_bg_id",  0, "search by warp_bg_id", 0);
    6466    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-diff_id",  0, "search by diff_id", 0);
    6567    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic_id", 0);

  • trunk/ippconfig/recipes

  • trunk/ippconfig/recipes/filerules-mef.mdc

    r28375 r28536  
    338338PPBACKGROUND.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits    IMAGE     COMP_IMG   CHIP       TRUE      NONE
    339339PPBACKGROUND.OUTPUT.MASK     OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK      COMP_MASK  CHIP       TRUE      NONE
     340PPBACKGROUND.CONFIG          OUTPUT {OUTPUT}.{CHIP.NAME}.ppBackground.mdc TEXT        NONE       CHIP       TRUE      NONE
     341PPIMAGE.STATS                OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS           NONE       CHIP       TRUE      NONE

  • trunk/ippconfig/recipes/filerules-simple.mdc

    r28375 r28536  
    303303PPBACKGROUND.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       FPA        TRUE      NONE
    304304PPBACKGROUND.OUTPUT.MASK     OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits      MASK            NONE       FPA        TRUE      NONE
     305PPBACKGROUND.CONFIG          OUTPUT {OUTPUT}.{CHIP.NAME}.ppBackground.mdc TEXT        NONE       CHIP       TRUE      NONE
     306PPIMAGE.STATS                OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS           NONE       CHIP       TRUE      NONE

  • trunk/ippconfig/recipes/filerules-split.mdc

    r28390 r28536  
    328328PPBACKGROUND.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           COMP_IMG   CHIP       TRUE      NONE
    329329PPBACKGROUND.OUTPUT.MASK     OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits      MASK            COMP_MASK  CHIP       TRUE      NONE
     330PPBACKGROUND.CONFIG          OUTPUT {OUTPUT}.{CHIP.NAME}.ppBackground.mdc TEXT        NONE       CHIP       TRUE      NONE
     331PPIMAGE.STATS                OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS           NONE       CHIP       TRUE      NONE
     332
    330333
    331334# FILERULE naming operators:

  • trunk/psModules

  • trunk/psModules/src/extras/ippStages.c

    r24881 r28536  
    1515    } else if (!strcmp(stageString, "chip")) {
    1616        return IPP_STAGE_CHIP;
     17    } else if (!strcmp(stageString, "chip_bg")) {
     18        return IPP_STAGE_CHIP_BG;
    1719    } else if (!strcmp(stageString, "camera")) {
    1820        return IPP_STAGE_CAMERA;
    1921    } else if (!strcmp(stageString, "warp")) {
    2022        return IPP_STAGE_WARP;
     23    } else if (!strcmp(stageString, "warp_bg")) {
     24        return IPP_STAGE_WARP_BG;
    2125    } else if (!strcmp(stageString, "fake")) {
    2226        return IPP_STAGE_FAKE;

  • trunk/psModules/src/extras/ippStages.h

    r27750 r28536  
    1313    IPP_STAGE_RAW = 0,
    1414    IPP_STAGE_CHIP,
     15    IPP_STAGE_CHIP_BG,
    1516    IPP_STAGE_CAMERA,
    1617    IPP_STAGE_FAKE,
    1718    IPP_STAGE_WARP,
     19    IPP_STAGE_WARP_BG,
    1820    IPP_STAGE_DIFF,
    1921    IPP_STAGE_STACK,

  • trunk/psphot

Note: See TracChangeset for help on using the changeset viewer.