Changeset 27840 for branches/simtest_nebulous_branches/tools/diff_outputs.pl

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• tools/diff_outputs.pl (modified) (7 diffs)

branches/simtest_nebulous_branches/tools/diff_outputs.pl

@@ -8 +8 @@
 use strict;
 
+use Carp;
 use DBI;
 use constant DB_SOCKET => '/var/run/mysqld/mysqld.sock'; # Socket for mysql
@@ -15 +16 @@
 use constant PRODUCTS => { 'REGULAR' => [ 'IMAGE', 'MASK', 'VARIANCE',
                                           'SOURCES', 'JPEG1', 'JPEG2',
-                                          'KERNEL' ],
-                           'ALL' => [ 'IMAGE', 'MASK', 'VARIANCE',
-                                      'SOURCES', 'JPEG1', 'JPEG2',
-                                      'KERNEL', 'INVERSE.IMAGE',
-                                      'INVERSE.MASK', 'INVERSE.VARIANCE',
-                                      'INVERSE.SOURCES' ],
+                                          'KERNEL', 'LOG' ],
+                           'ALL' => [ 'IMAGE', 'MASK', 'VARIANCE', 'SOURCES', 'JPEG1', 'JPEG2', 'KERNEL',
+                                      'INVERSE.IMAGE', 'INVERSE.MASK', 'INVERSE.VARIANCE', 'INVERSE.SOURCES',
+#                                      'INCONV.IMAGE', 'INCONV.MASK', 'INCONV.VARIANCE',
+#                                      'REFCONV.IMAGE', 'REFCONV.MASK', 'REFCONV.VARIANCE',
+                                      'LOG',
+                               ],
                            'INVERSE' => [ 'INVERSE.IMAGE', 'INVERSE.MASK',
                                           'INVERSE.VARIANCE',
-                                          'INVERSE.SOURCES' ],
+                                          'INVERSE.SOURCES',
+                                          'LOG', ],
                        };
 
@@ -38 +41 @@
                              'INVERSE.VARIANCE' => '.inv.wt.fits', # Variance
                              'INVERSE.SOURCES' => '.inv.cmf', # Sources
+                             'INCONV.IMAGE' => '.inConv.fits', # Convolved input image
+                             'INCONV.MASK' => '.inConv.mk.fits', # Convolved input mask
+                             'INCONV.VARIANCE' => '.inConv.wt.fits', # Convolved input variance
+                             'REFCONV.IMAGE' => '.refConv.fits', # Convolved reference image
+                             'REFCONV.MASK' => '.refConv.mk.fits', # Convolved reference mask
+                             'REFCONV.VARIANCE' => '.refConv.wt.fits', # Convolved reference variance
+                             'LOG' => '.log', # Log file
                          };
+
+# Products that get magicked
+use constant MAGIC => { 'IMAGE' => 1,
+                        'MASK' => 1,
+                        'VARIANCE' => 1,
+                        'SOURCES' => 1,
+                        'INVERSE.IMAGE' => 1,
+                        'INVERSE.MASK' => 1,
+                        'INVERSE.VARIANCE' => 1,
+                        'INVERSE.SOURCES' => 1,
+};
+
 
 my ($db_host, $db_name, $db_user, $db_pw); # Database details
@@ -44 +66 @@
 my ($input);                    # Input list
 my ($products);                 # Products of interest
+my ($muggle);                   # Not magicked?
 
 GetOptions(
@@ -53 +76 @@
            'skycell_id=s' => \$skycell_id, # Skycell identifier
            'products=s' => \$products, # Products of interest
+           'muggle'   => \$muggle, # Not magicked?
            ) or die "Unable to parse arguments.\n";
 die "Unknown option: @ARGV\n" if @ARGV;
@@ -96 +120 @@
     foreach my $product ( @products ) {
         next if (not defined $diff->{bothways} or $diff->{bothways} eq 'NULL' or not $diff->{bothways}) and $product =~ /INVERSE/;
-        copy_extension( $diff->{path_base}, ${EXTENSIONS()}{$product} );
+        my $path = $diff->{path_base};
+        if (defined $muggle and defined ${MAGIC()}{$product}) {
+            my @path = split /\//, $path;
+            my $last = pop @path;
+            push @path, "SR_$last";
+            $path = join '/', @path;
+        }
+        copy_extension( $path, ${EXTENSIONS()}{$product} );
     }
 }
@@ -110 +141 @@
 
     my $file = "$path$ext";     # File
-    my $source = `ipp_datapath.pl $file` or die "Unable to locate $file\n"; # Actual file
+    my $source = `ipp_datapath.pl $file` or (carp "Unable to locate $file\n" and return); # Actual file
     chomp $source;
     my ($target) = $source =~ m|^.*[:/](.*)|; # Target name
-    !system "cp $source $target" or die "Unable to copy $source\n";
+    !system "cp $source $target" or carp "Unable to copy $source\n";
 }