IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10534


Ignore:
Timestamp:
Dec 7, 2006, 12:56:06 PM (19 years ago)
Author:
Paul Price
Message:

Convert back to relative paths when putting filenames into the database.

Location:
trunk/ippScripts/scripts
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippScripts/scripts/detrend_norm_apply.pl

    r10419 r10534  
    5959
    6060my ($vol, $dir, $file) = File::Spec->splitpath( $input );
    61 $input = $ipprc->convert_filename ( $input );
     61$input = $ipprc->convert_filename_absolute( $input );
    6262
    6363# Output name
    6464my $outputRoot = $camera . '.' . $detType . '.norm.' . $detId . '.' . $iter; # Root output name
    6565$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
    66 $outputRoot = $ipprc->convert_filename ($outputRoot);
     66$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
    6767
    6868my $output = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
    … …  
    100100
    101101# Update the database
    102 $output = $ipprc->convert_filename ( $output );
    103 $b1name = $ipprc->convert_filename ( $b1name );
    104 $b2name = $ipprc->convert_filename ( $b2name );
     102$output = $ipprc->convert_filename_relative( $output );
     103$b1name = $ipprc->convert_filename_relative( $b1name );
     104$b2name = $ipprc->convert_filename_relative( $b2name );
    105105unless ($no_update) {
    106106    my $command = "$dettool -addnormalizedimfile -det_id $detId -iteration $iter -class_id $classId ".

  • trunk/ippScripts/scripts/detrend_norm_exp.pl

    r10419 r10534  
    9696my $outputRoot = $camera . '.' . $det_type . '.norm.' . $det_id . '.' . $iter; # Root output name
    9797$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
    98 $outputRoot = $ipprc->convert_filename ($outputRoot);
     98$outputRoot = $ipprc->convert_filename_absolute( $outputRoot );
    9999my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
    100100my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
    … …  
    104104open my $list2File, '>' . $list2Name;
    105105foreach my $file (@$files) {
    106     print $list1File ($ipprc->convert_filename ( $file->{b1_uri} ) . "\n");
    107     print $list2File ($ipprc->convert_filename ( $file->{b2_uri} ) . "\n");
     106    print $list1File ($ipprc->convert_filename_absolute( $file->{b1_uri} ) . "\n");
     107    print $list2File ($ipprc->convert_filename_absolute( $file->{b2_uri} ) . "\n");
    108108    push @means, $file->{bg};
    109109    push @stdevs, $file->{bg_stdev};
    … …  
    133133
    134134# Add the result into the database
    135 $jpeg1Name = $ipprc->convert_filename ( $jpeg1Name );
    136 $jpeg2Name = $ipprc->convert_filename ( $jpeg2Name );
     135$jpeg1Name = $ipprc->convert_filename_relative( $jpeg1Name );
     136$jpeg2Name = $ipprc->convert_filename_relative( $jpeg2Name );
    137137unless ($no_update) {
    138138    my $command = "$dettool -addnormalizedexp -det_id $det_id -iteration $iter " .

  • trunk/ippScripts/scripts/detrend_process_exp.pl

    r10419 r10534  
    9494my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root output name
    9595$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
    96 $outputRoot = $ipprc->convert_filename ($outputRoot);
     96$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
    9797my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
    9898my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
    … …  
    102102open my $list2File, '>' . $list2Name;
    103103foreach my $file (@$files) {
    104     print $list1File ($ipprc->convert_filename ( $file->{b1_uri} ) . "\n");
    105     print $list2File ($ipprc->convert_filename ( $file->{b2_uri} ) . "\n");
     104    print $list1File ($ipprc->convert_filename_absolute( $file->{b1_uri} ) . "\n");
     105    print $list2File ($ipprc->convert_filename_absolute( $file->{b2_uri} ) . "\n");
    106106    push @means, $file->{bg};
    107107    push @stdevs, $file->{bg_stdev};
    … …  
    132132
    133133# Add the result into the database
    134 $outputRoot = $ipprc->convert_filename ( $outputRoot );
    135 $jpeg1  = $ipprc->convert_filename ( $jpeg1 );
    136 $jpeg2  = $ipprc->convert_filename ( $jpeg2 );
     134$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
     135$jpeg1  = $ipprc->convert_filename_relative( $jpeg1 );
     136$jpeg2  = $ipprc->convert_filename_relative( $jpeg2 );
    137137unless ($no_update) {
    138138    my $command = "$dettool -addprocessedexp -det_id $det_id -exp_tag $exp_tag " .

  • trunk/ippScripts/scripts/detrend_process_imfile.pl

    r10419 r10534  
    6565my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root name
    6666$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
    67 $outputRoot = $ipprc->convert_filename ($outputRoot);
    68 $input_uri = $ipprc->convert_filename ( $input_uri );
     67$outputRoot = $ipprc->convert_filename_absolute( $outputRoot );
     68$input_uri = $ipprc->convert_filename_absolute( $input_uri );
    6969
    7070my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
    … …  
    102102
    103103# Take off the absolute path, to stuff into the database
    104 $outputImage = $ipprc->convert_filename ( $outputImage );
    105 $outputBin1  = $ipprc->convert_filename ( $outputBin1  );
    106 $outputBin2  = $ipprc->convert_filename ( $outputBin2  );
     104$outputImage = $ipprc->convert_filename_relative( $outputImage );
     105$outputBin1  = $ipprc->convert_filename_relative( $outputBin1  );
     106$outputBin2  = $ipprc->convert_filename_relative( $outputBin2  );
    107107
    108108# Add the processed file to the database

  • trunk/ippScripts/scripts/detrend_resid.pl

    r10419 r10534  
    8686my $outputRoot = $exp_tag . '.detresid.' . $det_id . '.' . $iter; # Root name
    8787$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
    88 $outputRoot = $ipprc->convert_filename ( $outputRoot );
    89 $input_uri = $ipprc->convert_filename ( $input_uri );
    90 $detrend = $ipprc->convert_filename ( $detrend );
     88$outputRoot = $ipprc->convert_filename_absolute( $outputRoot );
     89$input_uri = $ipprc->convert_filename_absolute( $input_uri );
     90$detrend = $ipprc->convert_filename_absolute( $detrend );
    9191
    9292my $outputName = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
    … …  
    124124
    125125# Add the processed file to the database
    126 $outputName = $ipprc->convert_filename ( $outputName );
    127 $bin1Name = $ipprc->convert_filename ( $bin1Name );
    128 $bin2Name = $ipprc->convert_filename ( $bin2Name );
     126$outputName = $ipprc->convert_filename_relative( $outputName );
     127$bin1Name = $ipprc->convert_filename_relative( $bin1Name );
     128$bin2Name = $ipprc->convert_filename_relative( $bin2Name );
    129129unless ($no_update) {
    130130    my $command = "$dettool -addresidimfile -det_id $det_id -iteration $iter -exp_tag $exp_tag " .

  • trunk/ippScripts/scripts/detrend_stack.pl

    r10419 r10534  
    7777my $outputRoot = $camera . '.' . $det_type . '.' . $det_id . '.' . $iter . '.' . $class_id; # Root name
    7878$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
    79 $outputRoot = $ipprc->convert_filename ($outputRoot);
     79$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
    8080my $outputStack = $outputRoot . '.fits'; # Output name
    8181my $outputStats = $outputRoot . '.stats'; # Statistics name
    … …  
    8484    foreach my $file (@$files) {
    8585        my $uri = $file->{uri}; # URI for input file
    86         $uri = $ipprc->convert_filename ($uri);
     86        $uri = $ipprc->convert_filename_absolute($uri);
    8787        $command .= ' ' . $uri;
    8888    }
    … …  
    114114
    115115# Add the resultant into the database
    116 $outputStack = $ipprc->convert_filename ($outputStack);
     116$outputStack = $ipprc->convert_filename_relative($outputStack);
    117117unless ($no_update) {
    118118    my $command = "$dettool -addstacked -det_id $det_id -iteration $iter -class_id $class_id" .

  • trunk/ippScripts/scripts/ipp_datapath.pl

    r10474 r10534  
    88use PS::IPP::Config;
    99my $ipprc = PS::IPP::Config->new();
    10 print $ipprc->convert_filename(shift @ARGV) . "\n";
     10print $ipprc->convert_filename_absolute(shift @ARGV) . "\n";
    1111
    12121;

  • trunk/ippScripts/scripts/phase0_exp.pl

    r10145 r10534  
    3131# Define setup
    3232use constant TYPE => "exp_type"; # Observation type keyword
    33 use constant DETRENDS => [ "bias", "dark", "shutter", "flat", "fringe" ]; # Observation types to mark as detrend
     33use constant DETRENDS => [ "bias", "zero", "dark", "shutter", "flat", "fringe" ]; # Observation types to mark as detrend
    3434use constant DETREND_FLAG => "-detrend"; # Flag to use to mark detrend exposure
    3535
    … …  
    154154    # Add the detrend flag
    155155    foreach my $detrendType (@{DETRENDS()}) {
    156         if (lc($values{TYPE()}) eq lc($detrendType)) {
     156        if (lc($values{TYPE()}) =~ /$detrendType/) {
    157157            push @command, DETREND_FLAG;
    158158            last;

  • trunk/ippScripts/scripts/phase0_imfile.pl

    r10419 r10534  
    8686
    8787# Resolve the input URI
    88 $uri = $ipprc->convert_filename ($uri);
     88$uri = $ipprc->convert_filename_absolute($uri);
    8989
    9090# Run ppStats on the input file

  • trunk/ippScripts/scripts/phase2.pl

    r10419 r10534  
    5353my $outputRoot =  $expTag . '.p2';
    5454$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
    55 $outputRoot = $ipprc->convert_filename ($outputRoot);
    56 $input = $ipprc->convert_filename ( $input );
    57 my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
    58 my $outputBin1 = $ipprc->filename("PPIMAGE.BIN1", $outputRoot, $classId);
    59 my $outputBin2 = $ipprc->filename("PPIMAGE.BIN2", $outputRoot, $classId);
     55$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
     56$input = $ipprc->convert_filename_absolute ( $input );
     57my $outputImage = $ipprc->filename_absolute("PPIMAGE.OUTPUT", $outputRoot, $classId);
     58my $outputBin1 = $ipprc->filename_absolute("PPIMAGE.BIN1", $outputRoot, $classId);
     59my $outputBin2 = $ipprc->filename_absolute("PPIMAGE.BIN2", $outputRoot, $classId);
    6060my $outputStats = $outputRoot  . '.' . $classId . '.stats';
    6161
    … …  
    8888
    8989# Add the processed file to the database
    90 $outputImage = $ipprc->convert_filename ( $outputImage);
    91 $outputBin1  = $ipprc->convert_filename ( $outputBin1 );
    92 $outputBin2  = $ipprc->convert_filename ( $outputBin2 );
     90$outputImage = $ipprc->convert_filename_relative( $outputImage);
     91$outputBin1  = $ipprc->convert_filename_relative( $outputBin1 );
     92$outputBin2  = $ipprc->convert_filename_relative( $outputBin2 );
    9393unless ($no_update) {
    9494    # Command to run dettool

  • trunk/ippScripts/scripts/phase3.pl

    r10419 r10534  
    9898my $outputRoot = $exp_tag . '.p3'; # Root output name
    9999$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
    100 $outputRoot = $ipprc->convert_filename ($outputRoot);
     100$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
    101101my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
    102102my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
    … …  
    106106open my $list2File, '>' . $list2Name;
    107107foreach my $file (@$files) {
    108     print $list1File ($ipprc->convert_filename ($file->{b1_uri}) . "\n");
    109     print $list2File ($ipprc->convert_filename ($file->{b2_uri}) . "\n");
     108    print $list1File ($ipprc->convert_filename_absolute($file->{b1_uri}) . "\n");
     109    print $list2File ($ipprc->convert_filename_absolute($file->{b2_uri}) . "\n");
    110110    push @means, $file->{bg};
    111111    push @stdevs, $file->{bg_stdev};
    … …  
    136136
    137137# Add the result into the database
    138 $outputRoot = $ipprc->convert_filename ($outputRoot);
    139 $jpeg1  = $ipprc->convert_filename ($jpeg1);
    140 $jpeg2  = $ipprc->convert_filename ($jpeg2);
     138$outputRoot = $ipprc->convert_filename_relative($outputRoot);
     139$jpeg1  = $ipprc->convert_filename_relative($jpeg1);
     140$jpeg2  = $ipprc->convert_filename_relative($jpeg2);
    141141unless ($no_update) {
    142142    my $command = "$p3tool -addprocessedexp -exp_tag $exp_tag -uri UNKNOWN " .
Note: See TracChangeset for help on using the changeset viewer.