Changeset 26861 for branches/eam_branches/20091201/tools/gpc1_find_images.pl

Timestamp:

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

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/20091201/tools/gpc1_find_images.pl (modified) (3 diffs)

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}) {