Changeset 26861

Timestamp:

Feb 10, 2010, 4:00:04 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/20091201/tools

Files:

• diff_outputs.pl (modified) (2 diffs)
• gpc1_find_images.pl (modified) (3 diffs)
• stack_outputs.pl (modified) (1 diff)
• wiki_nightly_stacks_table.pl (modified) (1 diff)

branches/eam_branches/20091201/tools/diff_outputs.pl

@@ -15 +15 @@
 use constant PRODUCTS => { 'REGULAR' => [ 'IMAGE', 'MASK', 'VARIANCE',
                                           'SOURCES', 'JPEG1', 'JPEG2',
-                                          'KERNEL' ],
+                                          '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', ],
                        };
 
@@ -44 +46 @@
                              'REFCONV.MASK' => '.refConv.mk.fits', # Convolved reference mask
                              'REFCONV.VARIANCE' => '.refConv.wt.fits', # Convolved reference variance
+                             'LOG' => '.log', # Log file
                          };
 

branches/eam_branches/20091201/tools/gpc1_find_images.pl

@@ -194 +194 @@
 
     %mapping = ();
-    if ((exists($opt{C})&&(exists($opt{S})))||
-        (exists($opt{W})&&(exists($opt{O})))||
-        exists($opt{I})) {
-
-        $sth_mapping = "SELECT skycell_id,class_id from warpSkyCellMap WHERE warp_id = $warp_id";
-        $mr = $db->selectall_arrayref( $sth_mapping );
-        foreach $mrr (@{ $mr }) {
-            my ($skycell,$class) = @{ $mrr };
-            my $raw_class = $class;
-            $raw_class =~ s/xy/ota/i;
-            push @{ $mapping{$skycell} }, $class;
-            push @{ $mapping{$skycell} }, $raw_class;
-            push @{ $mapping{$class} }, $skycell;
-            push @{ $mapping{$raw_class} }, $skycell;
+    unless (exists($opt{Y})) {
+        if ((exists($opt{C})&&(exists($opt{S})))||
+            (exists($opt{W})&&(exists($opt{O})))||
+            exists($opt{I})) {
+            $sth_mapping = "SELECT skycell_id,class_id from warpSkyCellMap WHERE warp_id = $warp_id";
+            $mr = $db->selectall_arrayref( $sth_mapping );
+            foreach $mrr (@{ $mr }) {
+                my ($skycell,$class) = @{ $mrr };
+                my $raw_class = $class;
+                $raw_class =~ s/xy/ota/i;
+                push @{ $mapping{$skycell} }, $class;
+                push @{ $mapping{$skycell} }, $raw_class;
+                push @{ $mapping{$class} }, $skycell;
+                push @{ $mapping{$raw_class} }, $skycell;
 #           print STDERR "$raw_class $class $skycell\n";
+            }
         }
     }
@@ -444 +445 @@
             return(1);
         }
+        elsif ($opt{M} && ($key =~ /mk.fits/)) {
+            if (($opt{O} ne '')&&($key !~ /$opt{O}/)) {
+                return(0); # Not the requested OTA
+            }
+            if (($opt{S} ne '')&& !(is_mapped($key,$opt{S}))) {
+                return(0); # Not the remapped skycell requested
+            }
+            return(1);
+        }           
+
     }
     return(0);
@@ -478 +489 @@
             return(0); # Not a fits
         }
+        elsif ($key =~ /refConv/) {
+            return(0);
+        }
+        elsif ($key =~ /inConv/) {
+            return(0);
+        }
+        elsif ($key =~ /inv/) {
+            return(0);
+        }
         elsif ($key =~ /wt.fits/) {
             return(0); # No handler for weight right now.
         }
+
         elsif ($key =~ /mask/) {
             if ($opt{M}) {

branches/eam_branches/20091201/tools/stack_outputs.pl

@@ -20 +20 @@
                              'B1' => '.b1.jpg', # Binned jpeg
                              'B2' => '.b2.jpg', # Binned jpeg
+                             'UNCONV.IMAGE' => '.unconv.fits', # Image
+                             'UNCONV.MASK' => '.unconv.mask.fits', # Mask
+                             'UNCONV.VARIANCE' => '.unconv.wt.fits', # Variance
                          };
 

branches/eam_branches/20091201/tools/wiki_nightly_stacks_table.pl

@@ -314 +314 @@
 
 foreach $d (sort (keys %diststacks)) {
+    unless (exists($fault_diststacks{$d})) {
+        next;
+    }
     print '||' . $d ;
     foreach $t (@targets) {