Changeset 37077

Timestamp:

Jul 17, 2014, 2:26:50 PM (12 years ago)

Author:

eugene

Message:

some mods to specify GPC1 as the camera (careful with GPC2); other minor mods

Location:

trunk/ippScripts/scripts

Files:

• dist_bundle.pl (modified) (2 diffs)
• ipp_apply_burntool_single.pl (modified) (1 diff)
• queuestaticsky.pl (modified) (1 prop)
• register_imfile.pl (modified) (1 diff)
• warp_skycell.pl (modified) (1 diff)

trunk/ippScripts/scripts/dist_bundle.pl

@@ -67 +67 @@
                       );
 my %empty_cleaned = ();
-
-
 
 # Look for programs we need
@@ -496 +494 @@
     } elsif ($stage eq "stack") {
         $type = $stack_cleaned{$rule};
-    } elsif ($stage eq "sky" or $stage eq 'skycal' or $stage eq 'stack_summary' or $stage eq 'ff') {
+    } elsif ($stage eq "sky" or $stage eq "skycal" or $stage eq "stack_summary" or $stage eq "ff") {
         $type = $empty_cleaned{$rule};
     } else {

trunk/ippScripts/scripts/ipp_apply_burntool_single.pl

@@ -45 +45 @@
     defined $dbname;
 
-# unless (defined $camera) {
-#    $camera = "GPC1";
-# }
+# XXX watch out for TC3 and GPC2 here:
+unless (defined $camera) {
+    if ($this_uri =~ /ota/) {
+        $camera = "GPC1";
+    }
+ }
 
 my $missing_tools;

trunk/ippScripts/scripts/register_imfile.pl

@@ -348 +348 @@
         $apply_command .= " --imfile_state $burntool_data->{imfile_state} ";
         $apply_command .= " --verbose " if $verbose;
+
+        # TEMPORARY
+        $apply_command .= " --camera GPC1";
         print "$apply_command\n";
         unless ($no_update) {

trunk/ippScripts/scripts/warp_skycell.pl

@@ -413 +413 @@
                 unless ($success) {
                     $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                    warn("Unable to perform warptool -addwarped: $error_code\n");
+                    warn("Unable to perform warptool -tofullskyfile: $error_code\n");
                     exit($error_code) if $try >= 2;
                     sleep 10;