Changeset 33575

Timestamp:

Mar 21, 2012, 11:32:34 AM (14 years ago)

Author:

bills

Message:

Create a temporary directory. In there create symlinks to the nebulous files
pass the symlink names to ds9. Thre result is a nice short useful filename in the ds9 screen
which is substr($filter, 0, 1) . basename($uri)

File:

• trunk/tools/dlapstacks (modified) (5 diffs)

trunk/tools/dlapstacks

@@ -30 +30 @@
 my ($singleframe, $fitToFrame, $deasin, $save_temps, $data_group);
 
+# XXX: get this from the ipprc
 my $temproot = '/local/ipp/tmp';
 my $outdir;
@@ -201 +202 @@
         $imagesize = 680;
     }
+    my $tempdir;
+    if (!$outdir) {
+        $tempdir = tempdir ("$temproot/dlapstacks.temp.XXXX", CLEANUP => !$save_temps);
+    }
     if ($deasin) {
         if ($outdir) {
-            print "Saving deasined files to $outdir\n";
+            print "Saving deasined files to $outdir\n" if $verbose;
             # user specified output directory save the files there
             if (!-d $outdir) {
@@ -210 +215 @@
         } else {
             # otherwise use a temporary directory
-            $outdir = tempdir ("$temproot/dlapstacks.temp.XXXX", CLEANUP => !$save_temps);
             print "deasined files will be saved to $outdir\n" if $save_temps;
+            $outdir = $tempdir;
         }
     }
@@ -222 +227 @@
         my $filename = $ipprc->file_resolve($pathname);
         next if !$filename;
-        # run ppstamp to undo the asin scaling. The output from ppstamp is linear F32 images
+
+        # prefix file name with filter
+        # this will either be the ppstamp output filename or we
+        # will put a symlink to it in tempdir
+        my $base = basename($pathname);
+        my $filt = substr $f->{filter}, 0, 1;
+        $base = "$filt.$base";
         if ($deasin) {
-            my $base = basename($pathname);
+            # run ppstamp to undo the asin scaling. The output from ppstamp is linear F32 images
+
+            # drop the .fits for the output path for ppstamp
             my $destbase = $base;
-
-            # drop the .fits for the output path for ppstamp
             $destbase =~ s/\.fits//g;
+
 
             my $command = "$ppstamp -wholefile -file $filename $outdir/$destbase";
@@ -241 +253 @@
             # new filename for ds9
             $filename = "$outdir/$base";
+        } else {
+            my $nebname = $filename;
+            $filename = "$tempdir/$base";
+            symlink $nebname, $filename or die "failed to symlink $nebname";
         }