Index: /trunk/ippScripts/scripts/background_chip.pl =================================================================== --- /trunk/ippScripts/scripts/background_chip.pl (revision 28535) +++ /trunk/ippScripts/scripts/background_chip.pl (revision 28536) @@ -144,6 +144,6 @@ my $out_image = $ipprc->filename("PPBACKGROUND.OUTPUT", $outroot, $class_id); my $out_mask = $ipprc->filename("PPBACKGROUND.OUTPUT.MASK", $outroot, $class_id); -my $out_stats = $ipprc->filename("PPIMAGE.STATS", $outroot, $class_id); -my $out_config = $ipprc->filename("PPIMAGE.CONFIG", $outroot, $class_id); +my $out_stats = $ipprc->filename("PPBACKGROUND.STATS", $outroot, $class_id); +my $out_config = $ipprc->filename("PPBACKGROUND.CONFIG", $outroot, $class_id); my $traceDest = $ipprc->filename("TRACE.IMFILE", $outroot, $class_id); Index: /trunk/ippScripts/scripts/dist_advancerun.pl =================================================================== --- /trunk/ippScripts/scripts/dist_advancerun.pl (revision 28535) +++ /trunk/ippScripts/scripts/dist_advancerun.pl (revision 28536) @@ -66,4 +66,5 @@ my $difftool = can_run('difftool') or (warn "Can't find difftool" and $missing_tools = 1); my $stacktool = can_run('stacktool') or (warn "Can't find stacktool" and $missing_tools = 1); +my $bgtool = can_run('bgtool') or (warn "Can't find bgtool" and $missing_tools = 1); if ($missing_tools) { &my_die("Can't find required tools.", $dist_id, $PS_EXIT_CONFIG_ERROR); @@ -82,4 +83,8 @@ $tool_cmd = "$chiptool -chip_id"; $list_mode = "-processedimfile"; + $component_key = "class_id"; +} elsif ($stage eq "chip_bg") { + $tool_cmd = "$bgtool -chip_bg_id"; + $list_mode = "-chip"; $component_key = "class_id"; } elsif ($stage eq "camera") { @@ -94,4 +99,8 @@ $tool_cmd = "$warptool -warp_id"; $list_mode = "-warped"; + $component_key = "skycell_id"; +} elsif ($stage eq "warp_bg") { + $tool_cmd = "$bgtool -warp_bg_id"; + $list_mode = "-warp"; $component_key = "skycell_id"; } elsif ($stage eq "stack") { Index: /trunk/ippScripts/scripts/dist_bundle.pl =================================================================== --- /trunk/ippScripts/scripts/dist_bundle.pl (revision 28535) +++ /trunk/ippScripts/scripts/dist_bundle.pl (revision 28536) @@ -35,4 +35,6 @@ 'PPIMAGE.CHIP.MASK' => 'mask', 'PPIMAGE.CHIP.VARIANCE' => 'variance' ); +my %chip_bg_cleaned = ( 'PPBACKGROUND.OUTPUT' => 'image', + 'PPBACKGROUND.OUTPUT.MASK' => 'mask' ); my %camera_cleaned = ( 'PSASTRO.OUTPUT.MASK' => 'mask' ); my %fake_cleaned; @@ -40,4 +42,6 @@ 'PSWARP.OUTPUT.MASK' => 'mask', 'PSWARP.OUTPUT.VARIANCE' => 'variance' ); +my %warp_bg_cleaned = ( 'PSWARP.OUTPUT' => 'image', + 'PSWARP.OUTPUT.MASK' => 'mask' ); my %diff_cleaned = ( 'PPSUB.OUTPUT' => 'image', 'PPSUB.OUTPUT.MASK' => 'mask', @@ -246,5 +250,5 @@ my $fh = open_with_retries($mask_resolved); close $fh; - } elsif ($stage eq "chip") { + } elsif ($stage eq "chip" or $stage eq "chip_bg") { $class_id = $component; } @@ -416,4 +420,6 @@ if ($stage eq "chip") { $config_file_rule = "PPIMAGE.CONFIG"; + } elsif ($stage eq "chip") { + $config_file_rule = "PPBACKGROUND.CONFIG"; } elsif ($stage eq "camera") { $config_file_rule = "PSASTRO.CONFIG"; @@ -422,4 +428,6 @@ return \@file_list; } elsif ($stage eq "warp") { + $config_file_rule = "PSWARP.CONFIG"; + } elsif ($stage eq "warp_bg") { $config_file_rule = "PSWARP.CONFIG"; } elsif ($stage eq "diff") { Index: /trunk/ippScripts/scripts/dist_defineruns.pl =================================================================== --- /trunk/ippScripts/scripts/dist_defineruns.pl (revision 28535) +++ /trunk/ippScripts/scripts/dist_defineruns.pl (revision 28536) @@ -83,5 +83,5 @@ push @stages, $stage; } else { - @stages = qw( raw chip camera fake warp diff stack SSdiff); + @stages = qw( raw chip chip_bg camera fake warp warp_bg diff stack SSdiff); } Index: /trunk/ippScripts/scripts/dist_make_fileset.pl =================================================================== --- /trunk/ippScripts/scripts/dist_make_fileset.pl (revision 28535) +++ /trunk/ippScripts/scripts/dist_make_fileset.pl (revision 28536) @@ -239,4 +239,6 @@ } elsif ($stage eq 'chip') { $query = "SELECT exp_name FROM chipRun JOIN rawExp USING(exp_id) WHERE chip_id = $stage_id"; + } elsif ($stage eq 'chip_bg') { + $query = "SELECT exp_name FROM chipBackgroundRun JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) WHERE chip_bg_id = $stage_id"; } elsif ($stage eq 'camera') { $query = "SELECT exp_name FROM camRun JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id)" @@ -248,4 +250,6 @@ $query = "SELECT exp_name FROM warpRun JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id)" . " JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) WHERE warp_id = $stage_id"; + } elsif ($stage eq 'warp_bg') { + $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"; } else { &my_die("$stage is invalid value for stage\n"); Index: /trunk/ippScripts/scripts/magic_destreak.pl =================================================================== --- /trunk/ippScripts/scripts/magic_destreak.pl (revision 28535) +++ /trunk/ippScripts/scripts/magic_destreak.pl (revision 28536) @@ -97,8 +97,8 @@ my ($skycell_args, $class_id, $skycell_id); -if (($stage eq "raw") or ($stage eq "chip")) { +if (($stage eq "raw") or ($stage eq "chip") or $stage eq "chip_bg") { $class_id = $component; $skycell_args = " -class_id $component"; -} elsif ($stage eq "warp") { +} elsif ($stage eq "warp" or $stage eq "warp_bg") { $skycell_id = $component; $skycell_args = " -skycell_id $component"; @@ -286,5 +286,9 @@ # $sources = $ipprc->filename("PSPHOT.OUT.CMF.SPL", $path_base); - } elsif ($stage eq "warp") { + } elsif ($stage eq "chip_bg") { + $image = $ipprc->filename("PPBACKGROUND.OUTPUT", $path_base, $class_id); + $mask = $ipprc->filename("PPBACKGROUND.OUTPUT.MASK", $path_base, $class_id); + $astrom = $ipprc->filename("PSASTRO.OUTPUT", $cam_path_base); + } elsif ($stage eq "warp" or $stage eq "warp_bg") { $image = $ipprc->filename("PSWARP.OUTPUT", $path_base); $mask = $ipprc->filename("PSWARP.OUTPUT.MASK", $path_base); Index: /trunk/ippTools/share/Makefile.am =================================================================== --- /trunk/ippTools/share/Makefile.am (revision 28535) +++ /trunk/ippTools/share/Makefile.am (revision 28536) @@ -145,4 +145,5 @@ disttool_definebyquery_camera.sql \ disttool_definebyquery_chip.sql \ + disttool_definebyquery_chip_bg.sql \ disttool_definebyquery_diff.sql \ disttool_definebyquery_fake.sql \ @@ -150,4 +151,5 @@ disttool_definebyquery_stack.sql \ disttool_definebyquery_warp.sql \ + disttool_definebyquery_warp_bg.sql \ disttool_definebyquery_SSdiff.sql \ disttool_defineinterest.sql \ @@ -228,6 +230,8 @@ magicdstool_definebyquery_raw.sql \ magicdstool_definebyquery_chip.sql \ + magicdstool_definebyquery_chip_bg.sql \ magicdstool_definebyquery_camera.sql \ magicdstool_definebyquery_warp.sql \ + magicdstool_definebyquery_warp_bg.sql \ magicdstool_definebyquery_diff.sql \ magicdstool_definecopy_chip.sql \ Index: /trunk/ippTools/share/disttool_definebyquery_chip_bg.sql =================================================================== --- /trunk/ippTools/share/disttool_definebyquery_chip_bg.sql (revision 28536) +++ /trunk/ippTools/share/disttool_definebyquery_chip_bg.sql (revision 28536) @@ -0,0 +1,26 @@ +SELECT DISTINCT + 'chip_bg' as stage, + chipBackgroundRun.chip_bg_id as stage_id, + chipBackgroundRun.magicked, + rawExp.exp_name as run_tag, + chipBackgroundRun.label, + chipBackgroundRun.data_group, + chipBackgroundRun.dist_group, + distTarget.target_id, + distTarget.clean +FROM chipBackgroundRun +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) +JOIN distTarget + ON distTarget.stage = 'chip_bg' + AND chipBackgroundRun.dist_group = distTarget.dist_group + AND rawExp.filter = distTarget.filter +JOIN rcInterest USING(target_id) +LEFT JOIN distRun + ON distRun.stage_id = chipBackgroundRun.chip_bg_id + AND distRun.target_id = distTarget.target_id + -- JOIN hook %s +WHERE distTarget.state = 'enabled' + AND rcInterest.state = 'enabled' + AND distRun.dist_id IS NULL -- no existing distRun + AND ((chipBackgroundRun.state = 'full') OR (distTarget.clean AND chipBackgroundRun.state = 'cleaned')) Index: /trunk/ippTools/share/disttool_definebyquery_warp_bg.sql =================================================================== --- /trunk/ippTools/share/disttool_definebyquery_warp_bg.sql (revision 28536) +++ /trunk/ippTools/share/disttool_definebyquery_warp_bg.sql (revision 28536) @@ -0,0 +1,30 @@ +SELECT DISTINCT + 'warp_bg' as stage, + warpBackgroundRun.warp_bg_id AS stage_id, + warpBackgroundRun.magicked, + rawExp.exp_name as run_tag, + warpBackgroundRun.label, + warpBackgroundRun.data_group, + distTarget.dist_group, + distTarget.target_id, + distTarget.clean +FROM warpBackgroundRun +JOIN warpRun USING(warp_id) +JOIN fakeRun USING(fake_id) +JOIN camRun ON fakeRun.cam_id = camRun.cam_id +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) +JOIN distTarget + ON distTarget.stage = 'warp_bg' + AND warpBackgroundRun.dist_group = distTarget.dist_group + AND rawExp.filter = distTarget.filter +JOIN rcInterest USING(target_id) +LEFT JOIN distRun ON (distRun.stage_id = warp_bg_id) + AND distRun.target_id = distTarget.target_id +WHERE distTarget.state = 'enabled' + AND rcInterest.state = 'enabled' + AND distRun.dist_id IS NULL + AND ((warpBackgroundRun.state = 'full') OR (distTarget.clean AND warpBackgroundRun.state = 'cleaned')) + + + Index: /trunk/ippTools/share/magicdstool_definebyquery_chip_bg.sql =================================================================== --- /trunk/ippTools/share/magicdstool_definebyquery_chip_bg.sql (revision 28536) +++ /trunk/ippTools/share/magicdstool_definebyquery_chip_bg.sql (revision 28536) @@ -0,0 +1,33 @@ +SELECT DISTINCT -- DISTINCT because we are going though diffInputSkyfile + magicRun.magic_id, + exp_id, + 'chip_bg' AS stage, + chip_bg_id AS stage_id, + chipBackgroundRun.data_group, + camRun.cam_id, + magicRun.label, + magicRun.workdir, + CAST(NULL AS SIGNED) AS inv_magic_id, + CAST(NULL AS SIGNED) AS inv_exp_id +FROM magicRun +JOIN magicMask USING(magic_id) +JOIN diffRun USING(diff_id) +JOIN diffInputSkyfile USING(diff_id) +JOIN warpRun + ON (!magicRun.inverse AND warp1 = warp_id) + OR ( magicRun.inverse AND warp2 = warp_id) +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun USING(chip_id, exp_id) +JOIN chipBackgroundRun USING(chip_id) +JOIN rawExp USING(exp_id) +LEFT JOIN magicDSRun + ON magicRun.magic_id = magicDSRun.magic_id + AND magicDSRun.stage = 'chip_bg' +WHERE magicRun.state = 'full' + AND ( -- rerun HOOK magicdstool sends "\n1 " if rerun else "\n0 " %s + OR magicDSRun.magic_ds_id IS NULL) + AND chipBackgroundRun.magicked = 0 + AND chipBackgroundRun.state = 'full' + AND camRun.state = 'full' + Index: /trunk/ippTools/share/magicdstool_definebyquery_warp_bg.sql =================================================================== --- /trunk/ippTools/share/magicdstool_definebyquery_warp_bg.sql (revision 28536) +++ /trunk/ippTools/share/magicdstool_definebyquery_warp_bg.sql (revision 28536) @@ -0,0 +1,32 @@ +SELECT DISTINCT -- DISTINCT because we are going though diffInputSkyfile + magicRun.magic_id, + exp_id, + 'warp_bg' AS stage, + warp_bg_id AS stage_id, + warpBackgroundRun.data_group, + 0 AS cam_id, + magicRun.label, + magicRun.workdir, + CAST(NULL AS SIGNED) AS inv_magic_id, + CAST(NULL AS SIGNED) AS inv_exp_id +FROM magicRun +JOIN magicMask USING(magic_id) +JOIN diffRun USING(diff_id) +JOIN diffInputSkyfile USING(diff_id) +JOIN warpRun + ON (!magicRun.inverse AND warp1 = warp_id) + OR ( magicRun.inverse AND warp2 = warp_id) +JOIN warpBackgroundRun USING(warp_bg_id) +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun USING(chip_id, exp_id) +JOIN rawExp USING(exp_id) +LEFT JOIN magicDSRun + ON magicRun.magic_id = magicDSRun.magic_id + AND magicDSRun.stage = 'warp_bg' +WHERE magicRun.state = 'full' + AND ( -- rerun HOOK magicdstool sends "\n1 " if rerun else "\n0 " %s + OR magicDSRun.magic_ds_id IS NULL) + AND warpBackgroundRun.magicked = 0 + AND warpBackgroundRun.state = 'full' + Index: /trunk/ippTools/src/disttool.c =================================================================== --- /trunk/ippTools/src/disttool.c (revision 28535) +++ /trunk/ippTools/src/disttool.c (revision 28536) @@ -210,4 +210,20 @@ psStringAppend(&query, " AND (chipRun.dist_group = '%s')", dist_group); } + } else if (!strcmp(stage, "chip_bg")) { + magicRunType = "chipBackgroundRun"; + runJoinStr = "chipBackgroundRun.chip_bg_id"; + query = pxDataGet("disttool_definebyquery_chip_bg.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + if (label) { + psStringAppend(&query, " AND (chipBackgroundRun.label = '%s')", label); + } + if (dist_group) { + psStringAppend(&query, " AND (chipBackgroundRun.dist_group = '%s')", dist_group); + } } else if (!strcmp(stage, "camera")) { magicRunType = "camRun"; // This is used below to set the magicked business @@ -258,4 +274,21 @@ if (dist_group) { psStringAppend(&query, " AND (warpRun.dist_group = '%s')", dist_group); + } + + } else if (!strcmp(stage, "warp_bg")) { + magicRunType = "warpBackgroundRun"; + runJoinStr = "warpBackgroundRun.warp_bg_id"; + query = pxDataGet("disttool_definebyquery_warp_bg.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + if (label) { + psStringAppend(&query, " AND (warpBackgroundRun.label = '%s')", label); + } + if (dist_group) { + psStringAppend(&query, " AND (warpBackgroundRun.dist_group = '%s')", dist_group); } Index: /trunk/ippTools/src/magicdstool.c =================================================================== --- /trunk/ippTools/src/magicdstool.c (revision 28535) +++ /trunk/ippTools/src/magicdstool.c (revision 28536) @@ -122,6 +122,8 @@ PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_bg_id", "chip_bg_id", "=="); PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-warp_bg_id", "warp_bg_id", "=="); PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "=="); PXOPT_COPY_S64(config->args, where, "-magic_id","magicRun.magic_id", "=="); @@ -140,4 +142,7 @@ query = pxDataGet("magicdstool_definebyquery_chip.sql"); break; + case IPP_STAGE_CHIP_BG: + query = pxDataGet("magicdstool_definebyquery_chip_bg.sql"); + break; case IPP_STAGE_CAMERA: query = pxDataGet("magicdstool_definebyquery_camera.sql"); @@ -145,4 +150,7 @@ case IPP_STAGE_WARP: query = pxDataGet("magicdstool_definebyquery_warp.sql"); + break; + case IPP_STAGE_WARP_BG: + query = pxDataGet("magicdstool_definebyquery_warp_bg.sql"); break; case IPP_STAGE_DIFF: @@ -720,4 +728,7 @@ query = "UPDATE chipProcessedImfile SET magicked = %" PRId64 " where chip_id = %" PRId64 " AND class_id = '%s'"; break; + case IPP_STAGE_CHIP_BG: + query = "UPDATE chipBackgroundImfile SET magicked = %" PRId64 " where chip_bg_id = %" PRId64 " AND class_id = '%s'"; + break; case IPP_STAGE_CAMERA: // no there is no magicked column in camProcessedExp so we have nothing to do @@ -727,4 +738,7 @@ query = "UPDATE warpSkyfile SET magicked = %" PRId64 " where warp_id = %" PRId64 " AND skycell_id = '%s'"; break; + case IPP_STAGE_WARP_BG: + query = "UPDATE warpBackgroundSkyfile SET magicked = %" PRId64 " where warp_bg_id = %" PRId64 " AND skycell_id = '%s'"; + break; case IPP_STAGE_DIFF: query = "UPDATE diffSkyfile SET magicked = %" PRId64 " where diff_id = %" PRId64 " AND skycell_id = '%s'"; @@ -794,4 +808,7 @@ query = "UPDATE chipRun SET magicked = %" PRId64 " where chip_id = %" PRId64; break; + case IPP_STAGE_CHIP_BG: + query = "UPDATE chipBackgroundRun SET magicked = %" PRId64 " where chip_bg_id = %" PRId64; + break; case IPP_STAGE_CAMERA: query = "UPDATE camRun SET magicked = %" PRId64 " where cam_id = %" PRId64; @@ -799,4 +816,7 @@ case IPP_STAGE_WARP: query = "UPDATE warpRun SET magicked = %" PRId64 " where warp_id = %" PRId64; + break; + case IPP_STAGE_WARP_BG: + query = "UPDATE warpBackgroundRun SET magicked = %" PRId64 " where warp_bg_id = %" PRId64; break; case IPP_STAGE_DIFF: Index: /trunk/ippTools/src/magicdstoolConfig.c =================================================================== --- /trunk/ippTools/src/magicdstoolConfig.c (revision 28535) +++ /trunk/ippTools/src/magicdstoolConfig.c (revision 28536) @@ -60,6 +60,8 @@ psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-chip_bg_id", 0, "search by chip_bg_id", 0); psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_bg_id", 0, "search by warp_bg_id", 0); psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff_id", 0); psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic_id", 0); Index: /trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-mef.mdc (revision 28535) +++ /trunk/ippconfig/recipes/filerules-mef.mdc (revision 28536) @@ -338,2 +338,4 @@ PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_IMG CHIP TRUE NONE PPBACKGROUND.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE +PPBACKGROUND.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppBackground.mdc TEXT NONE CHIP TRUE NONE +PPIMAGE.STATS OUTPUT {OUTPUT}.{CHIP.NAME}.stats STATS NONE CHIP TRUE NONE Index: /trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-simple.mdc (revision 28535) +++ /trunk/ippconfig/recipes/filerules-simple.mdc (revision 28536) @@ -303,2 +303,4 @@ PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE FPA TRUE NONE PPBACKGROUND.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE FPA TRUE NONE +PPBACKGROUND.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppBackground.mdc TEXT NONE CHIP TRUE NONE +PPIMAGE.STATS OUTPUT {OUTPUT}.{CHIP.NAME}.stats STATS NONE CHIP TRUE NONE Index: /trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-split.mdc (revision 28535) +++ /trunk/ippconfig/recipes/filerules-split.mdc (revision 28536) @@ -328,4 +328,7 @@ PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_IMG CHIP TRUE NONE PPBACKGROUND.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE +PPBACKGROUND.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppBackground.mdc TEXT NONE CHIP TRUE NONE +PPIMAGE.STATS OUTPUT {OUTPUT}.{CHIP.NAME}.stats STATS NONE CHIP TRUE NONE + # FILERULE naming operators: Index: /trunk/psModules/src/extras/ippStages.c =================================================================== --- /trunk/psModules/src/extras/ippStages.c (revision 28535) +++ /trunk/psModules/src/extras/ippStages.c (revision 28536) @@ -15,8 +15,12 @@ } else if (!strcmp(stageString, "chip")) { return IPP_STAGE_CHIP; + } else if (!strcmp(stageString, "chip_bg")) { + return IPP_STAGE_CHIP_BG; } else if (!strcmp(stageString, "camera")) { return IPP_STAGE_CAMERA; } else if (!strcmp(stageString, "warp")) { return IPP_STAGE_WARP; + } else if (!strcmp(stageString, "warp_bg")) { + return IPP_STAGE_WARP_BG; } else if (!strcmp(stageString, "fake")) { return IPP_STAGE_FAKE; Index: /trunk/psModules/src/extras/ippStages.h =================================================================== --- /trunk/psModules/src/extras/ippStages.h (revision 28535) +++ /trunk/psModules/src/extras/ippStages.h (revision 28536) @@ -13,7 +13,9 @@ IPP_STAGE_RAW = 0, IPP_STAGE_CHIP, + IPP_STAGE_CHIP_BG, IPP_STAGE_CAMERA, IPP_STAGE_FAKE, IPP_STAGE_WARP, + IPP_STAGE_WARP_BG, IPP_STAGE_DIFF, IPP_STAGE_STACK,