IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10419


Ignore:
Timestamp:
Dec 3, 2006, 8:42:44 AM (19 years ago)
Author:
eugene
Message:

added ipprc.convert_filename method, replaced workdir conversions with convert_filename

Location:
trunk/ippScripts/scripts
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippScripts/scripts/detrend_norm_apply.pl

    r9959 r10419  
    5959
    6060my ($vol, $dir, $file) = File::Spec->splitpath( $input );
    61 $input = File::Spec->rel2abs( $input, $ipprc->workdir() );
     61$input = $ipprc->convert_filename ( $input );
    6262
    6363# Output name
    6464my $outputRoot = $camera . '.' . $detType . '.norm.' . $detId . '.' . $iter; # Root output name
    65 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
     65$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
     66$outputRoot = $ipprc->convert_filename ($outputRoot);
    6667
    6768my $output = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
    … …  
    99100
    100101# Update the database
    101 $output = File::Spec->abs2rel( $output, $ipprc->workdir() );
    102 $b1name = File::Spec->abs2rel( $b1name, $ipprc->workdir() );
    103 $b2name = File::Spec->abs2rel( $b2name, $ipprc->workdir() );
     102$output = $ipprc->convert_filename ( $output );
     103$b1name = $ipprc->convert_filename ( $b1name );
     104$b2name = $ipprc->convert_filename ( $b2name );
    104105unless ($no_update) {
    105106    my $command = "$dettool -addnormalizedimfile -det_id $detId -iteration $iter -class_id $classId ".

  • trunk/ippScripts/scripts/detrend_norm_exp.pl

    r9892 r10419  
    9595# Generate the file list, and get the statistics
    9696my $outputRoot = $camera . '.' . $det_type . '.norm.' . $det_id . '.' . $iter; # Root output name
    97 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
     97$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
     98$outputRoot = $ipprc->convert_filename ($outputRoot);
    9899my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
    99100my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
    … …  
    103104open my $list2File, '>' . $list2Name;
    104105foreach my $file (@$files) {
    105     print $list1File (File::Spec->rel2abs( $file->{b1_uri}, $ipprc->workdir() ) . "\n");
    106     print $list2File (File::Spec->rel2abs( $file->{b2_uri}, $ipprc->workdir() ) . "\n");
     106    print $list1File ($ipprc->convert_filename ( $file->{b1_uri} ) . "\n");
     107    print $list2File ($ipprc->convert_filename ( $file->{b2_uri} ) . "\n");
    107108    push @means, $file->{bg};
    108109    push @stdevs, $file->{bg_stdev};
    … …  
    132133
    133134# Add the result into the database
    134 $jpeg1Name = File::Spec->abs2rel( $jpeg1Name, $ipprc->workdir() );
    135 $jpeg2Name = File::Spec->abs2rel( $jpeg2Name, $ipprc->workdir() );
     135$jpeg1Name = $ipprc->convert_filename ( $jpeg1Name );
     136$jpeg2Name = $ipprc->convert_filename ( $jpeg2Name );
    136137unless ($no_update) {
    137138    my $command = "$dettool -addnormalizedexp -det_id $det_id -iteration $iter " .

  • trunk/ippScripts/scripts/detrend_process_exp.pl

    r9892 r10419  
    9393# Generate the file list, and get the statistics
    9494my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root output name
    95 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
     95$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
     96$outputRoot = $ipprc->convert_filename ($outputRoot);
    9697my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
    9798my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
    … …  
    101102open my $list2File, '>' . $list2Name;
    102103foreach my $file (@$files) {
    103     print $list1File (File::Spec->rel2abs( $file->{b1_uri}, $ipprc->workdir() ) . "\n");
    104     print $list2File (File::Spec->rel2abs( $file->{b2_uri}, $ipprc->workdir() ) . "\n");
     104    print $list1File ($ipprc->convert_filename ( $file->{b1_uri} ) . "\n");
     105    print $list2File ($ipprc->convert_filename ( $file->{b2_uri} ) . "\n");
    105106    push @means, $file->{bg};
    106107    push @stdevs, $file->{bg_stdev};
    … …  
    131132
    132133# Add the result into the database
    133 $outputRoot = File::Spec->abs2rel( $outputRoot, $ipprc->workdir() );
    134 $jpeg1  = File::Spec->abs2rel( $jpeg1, $ipprc->workdir() );
    135 $jpeg2  = File::Spec->abs2rel( $jpeg2, $ipprc->workdir() );
     134$outputRoot = $ipprc->convert_filename ( $outputRoot );
     135$jpeg1  = $ipprc->convert_filename ( $jpeg1 );
     136$jpeg2  = $ipprc->convert_filename ( $jpeg2 );
    136137unless ($no_update) {
    137138    my $command = "$dettool -addprocessedexp -det_id $det_id -exp_tag $exp_tag " .

  • trunk/ippScripts/scripts/detrend_process_imfile.pl

    r9892 r10419  
    6464my ($vol, $dir, $file) = File::Spec->splitpath( $input_uri );
    6565my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root name
    66 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
    67 $input_uri = File::Spec->rel2abs( $input_uri, $ipprc->workdir() );
     66$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
     67$outputRoot = $ipprc->convert_filename ($outputRoot);
     68$input_uri = $ipprc->convert_filename ( $input_uri );
    6869
    6970my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
    … …  
    101102
    102103# Take off the absolute path, to stuff into the database
    103 $outputImage = File::Spec->abs2rel( $outputImage, $ipprc->workdir() );
    104 $outputBin1 = File::Spec->abs2rel( $outputBin1, $ipprc->workdir() );
    105 $outputBin2 = File::Spec->abs2rel( $outputBin2, $ipprc->workdir() );
     104$outputImage = $ipprc->convert_filename ( $outputImage );
     105$outputBin1  = $ipprc->convert_filename ( $outputBin1 );
     106$outputBin2  = $ipprc->convert_filename ( $outputBin2 );
    106107
    107108# Add the processed file to the database

  • trunk/ippScripts/scripts/detrend_reject_imfile.pl

    r10333 r10419  
    7171# Generate the file list, and get the statistics
    7272my $outputRoot = $exp_tag . '.detresid.' . $det_id . '.' . $iter; # Root output name
    73 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
     73$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
     74$outputRoot = $ipprc->convert_filename ($outputRoot);
    7475my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
    7576my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
    … …  
    7980open my $list2File, '>' . $list2Name;
    8081foreach my $file (@$files) {
    81     print $list1File (File::Spec->rel2abs( $file->{b1_uri}, $ipprc->workdir() ) . "\n");
    82     print $list2File (File::Spec->rel2abs( $file->{b2_uri}, $ipprc->workdir() ) . "\n");
     82    print $list1File ($ipprc->convert_filename ( $file->{b1_uri} ) . "\n");
     83    print $list2File ($ipprc->convert_filename ( $file->{b2_uri} ) . "\n");
    8384    push @means, $file->{bg};
    8485    ## calculate the root-mean-square of the bd_stdevs
    … …  
    194195
    195196# Add the result into the database
    196 $jpeg1Name = File::Spec->abs2rel( $jpeg1Name, $ipprc->workdir() );
    197 $jpeg2Name = File::Spec->abs2rel( $jpeg2Name, $ipprc->workdir() );
     197$jpeg1Name = $ipprc->convert_filename ( $jpeg1Name );
     198$jpeg2Name = $ipprc->convert_filename ( $jpeg2Name );
    198199unless ($no_update) {
    199200    my $command = "$dettool -addresidexp -det_id $det_id -iteration $iter -exp_tag $exp_tag " .

  • trunk/ippScripts/scripts/detrend_resid.pl

    r10321 r10419  
    8585my ($vol, $dir, $file) = File::Spec->splitpath( $input_uri );
    8686my $outputRoot = $exp_tag . '.detresid.' . $det_id . '.' . $iter; # Root name
    87 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
    88 $input_uri = File::Spec->rel2abs( $input_uri, $ipprc->workdir() );
    89 $detrend = File::Spec->rel2abs( $detrend, $ipprc->workdir() );
     87$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 );
    9091
    9192my $outputName = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
    … …  
    123124
    124125# Add the processed file to the database
    125 $outputName = File::Spec->abs2rel ($outputName, $ipprc->workdir() );
    126 $bin1Name = File::Spec->abs2rel( $bin1Name, $ipprc->workdir() );
    127 $bin2Name = File::Spec->abs2rel( $bin2Name, $ipprc->workdir() );
     126$outputName = $ipprc->convert_filename ( $outputName );
     127$bin1Name = $ipprc->convert_filename ( $bin1Name );
     128$bin2Name = $ipprc->convert_filename ( $bin2Name );
    128129unless ($no_update) {
    129130    my $command = "$dettool -addresidimfile -det_id $det_id -iteration $iter -exp_tag $exp_tag " .

  • trunk/ippScripts/scripts/detrend_stack.pl

    r9869 r10419  
    7676# Stack the files
    7777my $outputRoot = $camera . '.' . $det_type . '.' . $det_id . '.' . $iter . '.' . $class_id; # Root name
    78 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
     78$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
     79$outputRoot = $ipprc->convert_filename ($outputRoot);
    7980my $outputStack = $outputRoot . '.fits'; # Output name
    8081my $outputStats = $outputRoot . '.stats'; # Statistics name
    … …  
    8384    foreach my $file (@$files) {
    8485        my $uri = $file->{uri}; # URI for input file
    85         $uri = File::Spec->rel2abs( $uri, $ipprc->workdir() );
     86        $uri = $ipprc->convert_filename ($uri);
    8687        $command .= ' ' . $uri;
    8788    }
    … …  
    113114
    114115# Add the resultant into the database
    115 $outputStack = File::Spec->abs2rel( $outputStack, $ipprc->workdir() );
     116$outputStack = $ipprc->convert_filename ($outputStack);
    116117unless ($no_update) {
    117118    my $command = "$dettool -addstacked -det_id $det_id -iteration $iter -class_id $class_id" .

  • trunk/ippScripts/scripts/phase0_imfile.pl

    r10398 r10419  
    8686
    8787# Resolve the input URI
    88 $uri = File::Spec->rel2abs( $uri, $ipprc->workdir() );
     88$uri = $ipprc->convert_filename ($uri);
    8989
    9090# Run ppStats on the input file

  • trunk/ippScripts/scripts/phase2.pl

    r9892 r10419  
    5252my ($vol, $dir, $file) = File::Spec->splitpath( $input );
    5353my $outputRoot =  $expTag . '.p2';
    54 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
    55 $input = File::Spec->rel2abs( $input, $ipprc->workdir() );
     54$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
     55$outputRoot = $ipprc->convert_filename ($outputRoot);
     56$input = $ipprc->convert_filename ( $input );
    5657my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
    5758my $outputBin1 = $ipprc->filename("PPIMAGE.BIN1", $outputRoot, $classId);
    … …  
    8788
    8889# Add the processed file to the database
    89 $outputImage = File::Spec->abs2rel( $outputImage, $ipprc->workdir() );
    90 $outputBin1 = File::Spec->abs2rel( $outputBin1, $ipprc->workdir() );
    91 $outputBin2 = File::Spec->abs2rel( $outputBin2, $ipprc->workdir() );
     90$outputImage = $ipprc->convert_filename ( $outputImage);
     91$outputBin1  = $ipprc->convert_filename ( $outputBin1 );
     92$outputBin2  = $ipprc->convert_filename ( $outputBin2 );
    9293unless ($no_update) {
    9394    # Command to run dettool

  • trunk/ippScripts/scripts/phase3.pl

    r9892 r10419  
    9797# Generate the file list, and get the statistics
    9898my $outputRoot = $exp_tag . '.p3'; # Root output name
    99 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
     99$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
     100$outputRoot = $ipprc->convert_filename ($outputRoot);
    100101my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
    101102my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
    … …  
    105106open my $list2File, '>' . $list2Name;
    106107foreach my $file (@$files) {
    107     print $list1File (File::Spec->rel2abs( $file->{b1_uri}, $ipprc->workdir() ) . "\n");
    108     print $list2File (File::Spec->rel2abs( $file->{b2_uri}, $ipprc->workdir() ) . "\n");
     108    print $list1File ($ipprc->convert_filename ($file->{b1_uri}) . "\n");
     109    print $list2File ($ipprc->convert_filename ($file->{b2_uri}) . "\n");
    109110    push @means, $file->{bg};
    110111    push @stdevs, $file->{bg_stdev};
    … …  
    135136
    136137# Add the result into the database
    137 $outputRoot = File::Spec->abs2rel( $outputRoot, $ipprc->workdir() );
    138 $jpeg1  = File::Spec->abs2rel( $jpeg1, $ipprc->workdir() );
    139 $jpeg2  = File::Spec->abs2rel( $jpeg2, $ipprc->workdir() );
     138$outputRoot = $ipprc->convert_filename ($outputRoot);
     139$jpeg1  = $ipprc->convert_filename ($jpeg1);
     140$jpeg2  = $ipprc->convert_filename ($jpeg2);
    140141unless ($no_update) {
    141142    my $command = "$p3tool -addprocessedexp -exp_tag $exp_tag -uri UNKNOWN " .
Note: See TracChangeset for help on using the changeset viewer.