IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12079


Ignore:
Timestamp:
Feb 27, 2007, 10:13:31 AM (19 years ago)
Author:
Paul Price
Message:

Changing from b1_uri as the output root filename and path to path_base.

Location:
trunk/ippScripts/scripts
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippScripts/scripts/camera_exp.pl

    r12021 r12079  
    125125    $workdir = $ipprc->convert_filename_absolute( $workdir );
    126126} else {
    127     my $example = ${$files}[0]->{b1_uri}; # Example original root name
     127    my $example = ${$files}[0]->{path_base}; # Example original root name
    128128    my ($vol, $dir, $file) = File::Spec->splitpath( $ipprc->convert_filename_absolute( $example ) );
    129129    $workdir = $dir;
    … …  
    151151my $chipObjects;
    152152foreach my $file (@$files) {
    153     # use the b1_uri as OUTPUT root and convert the filenames
    154     # with ipprc->filename:
     153    # use the path_base as OUTPUT root and convert the filenames with ipprc->filename:
    155154    my $class_id = $file->{class_id};
    156     my $origRoot = $ipprc->convert_filename_absolute( $file->{b1_uri} ); # Original root name
     155    my $origRoot = $ipprc->convert_filename_absolute( $file->{path_base} ); # Original root name
    157156
    158157    # if there is only one chip, we use this name for the input to addstar
    … …  
    230229# XXX keep the same outroot as the input
    231230# Add the result into the database
    232 $outputRoot = $ipprc->convert_filename_relative($outputRoot);
    233 $jpeg1  = $ipprc->convert_filename_relative($jpeg1);
    234 $jpeg2  = $ipprc->convert_filename_relative($jpeg2);
     231$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
    235232
    236233unless ($no_update) {
    237234    my $command = "$camtool -addprocessedexp -exp_tag $exp_tag -uri UNKNOWN " .
    238         "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $outputRoot " .
     235        "-recip " . RECIPE1() . "," . RECIPE2() . " -path_base $outputRoot " .
    239236        "-bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev " .
    240237        "-sigma_ra 0.0 -sigma_dec 0.0 -nastro 0 -zp_mean 0.0 -zp_stdev 0.0"; # Command to run

  • trunk/ippScripts/scripts/chip_imfile.pl

    r12021 r12079  
    140140    $command .= " -recip " . RECIPE;
    141141    $command .= " -uri $outputImage";
    142     $command .= " -b1_uri $outputRoot";
     142    $command .= " -path_base $outputRoot";
    143143    $command .= " -bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev";
    144144    $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/detrend_norm_apply.pl

    r11837 r12079  
    130130# Update the database
    131131$output = $ipprc->convert_filename_relative( $output );
    132 $b1name = $ipprc->convert_filename_relative( $b1name );
    133 $b2name = $ipprc->convert_filename_relative( $b2name );
     132$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
    134133
    135134my $bg = ($stats->bg_mean() or 'NAN');
    … …  
    139138unless ($no_update) {
    140139    my $command = "$dettool -addnormalizedimfile -det_id $det_id -iteration $iter -class_id $class_id ".
    141         "-uri $output -b1_uri $outputRoot"; # Command to run
     140        "-uri $output -path_base $outputRoot"; # Command to run
    142141    $command .= " -bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev";
    143142    $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/detrend_norm_exp.pl

    r11837 r12079  
    118118    $workdir = $ipprc->convert_filename_absolute( $workdir );
    119119} else {
    120     my $example = ${$files}[0]->{b1_uri}; # Example file, for path
     120    my $example = ${$files}[0]->{path_base}; # Example file, for path
    121121    my ($vol, $dir, $file) = File::Spec->splitpath( $example );
    122122    $workdir = $dir;
    … …  
    135135open my $list2File, '>' . $list2Name;
    136136foreach my $file (@$files) {
    137     my $origRoot = $ipprc->convert_filename_absolute( $file->{b1_uri} ); # Original root name
     137    my $origRoot = $ipprc->convert_filename_absolute( $file->{path_base} ); # Original root name
    138138    print $list1File ( $ipprc->filename( "PPIMAGE.BIN1", $origRoot, $file->{class_id} ) . "\n");
    139139    print $list2File ( $ipprc->filename( "PPIMAGE.BIN2", $origRoot, $file->{class_id} ) . "\n");
    … …  
    167167
    168168# Add the result into the database
    169 $jpeg1Name = $ipprc->convert_filename_relative( $jpeg1Name );
    170 $jpeg2Name = $ipprc->convert_filename_relative( $jpeg2Name );
     169$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
     170
    171171unless ($no_update) {
    172172    my $command = "$dettool -addnormalizedexp -det_id $det_id -iteration $iter " .
    173         "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $outputRoot " .
     173        "-recip " . RECIPE1() . "," . RECIPE2() . " -path_base $outputRoot " .
    174174        "-bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev"; # Command to run
    175175    $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/detrend_process_exp.pl

    r11837 r12079  
    116116    $workdir = $ipprc->convert_filename_absolute( $workdir );
    117117} else {
    118     my $example = ${$files}[0]->{b1_uri}; # Example original root name
     118    my $example = ${$files}[0]->{path_base}; # Example original root name
    119119    my ($vol, $dir, $file) = File::Spec->splitpath( $example );
    120120    $workdir = $dir;
    … …  
    131131open my $list2File, '>' . $list2Name;
    132132foreach my $file (@$files) {
    133     my $origRoot = $ipprc->convert_filename_absolute( $file->{b1_uri} ); # Original root name
     133    my $origRoot = $ipprc->convert_filename_absolute( $file->{path_base} ); # Original root name
    134134    print $list1File ($ipprc->filename( "PPIMAGE.BIN1", $origRoot, $file->{class_id} ) . "\n");
    135135    print $list2File ($ipprc->filename( "PPIMAGE.BIN2", $origRoot, $file->{class_id} ) . "\n");
    … …  
    172172# Add the result into the database
    173173$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
    174 $jpeg1  = $ipprc->convert_filename_relative( $jpeg1 );
    175 $jpeg2  = $ipprc->convert_filename_relative( $jpeg2 );
     174
    176175unless ($no_update) {
    177176    my $command = "$dettool -addprocessedexp -det_id $det_id -exp_tag $exp_tag " .
    178         "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $outputRoot " .
     177        "-recip " . RECIPE1() . "," . RECIPE2() . " -path_base $outputRoot " .
    179178        "-bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev"; # Command to run
    180179    $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/detrend_process_imfile.pl

    r11837 r12079  
    134134# Take off the absolute path, to stuff into the database
    135135$outputImage = $ipprc->convert_filename_relative( $outputImage );
    136 $outputBin1  = $ipprc->convert_filename_relative( $outputBin1  );
    137 $outputBin2  = $ipprc->convert_filename_relative( $outputBin2  );
     136$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
    138137
    139138my $bg = ($stats->bg_mean() or 'NAN');
    … …  
    144143unless ($no_update) {
    145144    my $command = "$dettool -addprocessedimfile -det_id $det_id -exp_tag $exp_tag " .
    146         "-class_id $class_id -recip $recipe -uri $outputImage -b1_uri $outputRoot"; # Command to run dettool
     145        "-class_id $class_id -recip $recipe -uri $outputImage -path_base $outputRoot"; # Command to run dettool
    147146    $command .= " -bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev";
    148147    $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/detrend_reject_imfile.pl

    r11837 r12079  
    9696    $workdir = $ipprc->convert_filename_absolute( $workdir );
    9797} else {
    98     my $example = ${$files}[0]->{b1_uri}; # Example original root name
     98    my $example = ${$files}[0]->{path_base}; # Example original root name
    9999    my ($vol, $dir, $file) = File::Spec->splitpath( $example );
    100100    $workdir = $dir;
    … …  
    114114open my $list2File, '>' . $list2Name;
    115115foreach my $file (@$files) {
    116     my $origRoot = $ipprc->convert_filename_absolute( $file->{b1_uri} ); # Original root name
     116    my $origRoot = $ipprc->convert_filename_absolute( $file->{path_base} ); # Original root name
    117117    print $list1File ($ipprc->filename( "PPIMAGE.BIN1", $origRoot, $file->{class_id} ) . "\n");
    118118    print $list2File ($ipprc->filename( "PPIMAGE.BIN2", $origRoot, $file->{class_id} ) . "\n");
    … …  
    283283
    284284# Add the result into the database
    285 $jpeg1Name = $ipprc->convert_filename_relative( $jpeg1Name );
    286 $jpeg2Name = $ipprc->convert_filename_relative( $jpeg2Name );
     285$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
    287286
    288287my $bg = $mean;
    … …  
    292291unless ($no_update) {
    293292    my $command = "$dettool -addresidexp -det_id $det_id -iteration $iter -exp_tag $exp_tag " .
    294         "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $outputRoot "; # Command to run
     293        "-recip " . RECIPE1() . "," . RECIPE2() . " -path_base $outputRoot "; # Command to run
    295294    $command .= " -bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev";
    296295    $command .= ' -reject' if $reject;

  • trunk/ippScripts/scripts/detrend_resid.pl

    r11837 r12079  
    176176# Add the processed file to the database
    177177$outputName = $ipprc->convert_filename_relative( $outputName );
    178 $bin1Name = $ipprc->convert_filename_relative( $bin1Name );
    179 $bin2Name = $ipprc->convert_filename_relative( $bin2Name );
     178$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
    180179
    181180my $bg = ($stats->bg_mean() or 'NAN');
    … …  
    185184unless ($no_update) {
    186185    my $command = "$dettool -addresidimfile -det_id $det_id -iteration $iter -exp_tag $exp_tag " .
    187         "-class_id $class_id -recip $recipe -uri $outputName -b1_uri $outputRoot"; # Command to run dettool
     186        "-class_id $class_id -recip $recipe -uri $outputName -path_base $outputRoot"; # Command to run dettool
    188187    $command .= " -bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev";
    189188    $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/diff_skycell.pl

    r12056 r12079  
    156156# Add the processed file to the database
    157157$outputName = $ipprc->convert_filename_relative( $outputName );
     158$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
    158159
    159160my $bg = ($stats->bg_mean() or 'NAN');
    … …  
    164165    # Add the subtraction result
    165166    {
    166         my $command = "$difftool -adddiffskyfile -diff_id $diff_id -uri $outputName"; # -b1_uri $outputRoot";
     167        my $command = "$difftool -adddiffskyfile -diff_id $diff_id -uri $outputName -path_base $outputRoot";
    167168        $command .= " -bg $bg -bg_stdev $bg_stdev";
    168169        $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/stack_skycell.pl

    r12056 r12079  
    115115
    116116my $outputName = $outputRoot . ".fits";
    117 #my $bin1Name =  $ipprc->filename("PPIMAGE.BIN1", $outputRoot);
    118 #my $bin2Name =  $ipprc->filename("PPIMAGE.BIN2", $outputRoot);
     117#my $bin1Name =  $ipprc->filename("PPSTAC.BIN1", $outputRoot);
     118#my $bin2Name =  $ipprc->filename("PPSTAC.BIN2", $outputRoot);
    119119my $outputStats = $outputRoot . '.stats';
    120120
    … …  
    149149# Add the processed file to the database
    150150$outputName = $ipprc->convert_filename_relative( $outputName );
     151$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
    151152
    152153my $bg = ($stats->bg_mean() or 'NAN');
    … …  
    157158    # Add the stack result
    158159    {
    159         my $command = "$stacktool -addsumskyfile -stack_id $stack_id -uri $outputName"; # -b1_uri $outputRoot";
     160        my $command = "$stacktool -addsumskyfile -stack_id $stack_id -uri $outputName -path_base $outputRoot";
    160161        $command .= " -bg $bg -bg_stdev $bg_stdev";
    161162        $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/warp_skycell.pl

    r12073 r12079  
    136136# Take off the absolute path, to stuff into the database
    137137$outputImage = $ipprc->convert_filename_relative( $outputImage );
    138 $outputBin1  = $ipprc->convert_filename_relative( $outputBin1  );
    139 $outputBin2  = $ipprc->convert_filename_relative( $outputBin2  );
     138$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
    140139
    141140my $bg = ($stats->bg_mean() or 'NAN');
    … …  
    145144unless ($no_update) {
    146145    my $command = "$warptool -addwarped -warp_id $warp_id -skycell_id $skycell_id -tess_id $tess_id" .
    147         " -uri $outputImage"; # -b1_uri $outputRoot"; # Command to run dettool
     146        " -uri $outputImage -path_base $outputRoot"; # Command to run dettool
    148147    $command .= " -bg $bg -bg_stdev $bg_stdev";
    149148    $command .= " -dbname $dbname" if defined $dbname;
Note: See TracChangeset for help on using the changeset viewer.