Changeset 36930

Timestamp:

Jun 20, 2014, 4:17:40 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk / eam/ipp-20140610

Location:

tags/ipp-pv3-cr-20140614/ippScripts/scripts

Files:

• . (modified) (1 prop)
• psphot_fullforce_warp.pl (modified) (1 diff)
• queuestaticsky.pl (modified) (1 prop)
• sc_prepare_camera.pl (modified) (1 prop)
• sc_transfer_tool.pl (modified) (3 diffs)

tags/ipp-pv3-cr-20140614/ippScripts/scripts/psphot_fullforce_warp.pl

@@ -186 +186 @@
     $command .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF";
     $command .= " -F PSPHOT.BACKMDL PSPHOT.BACKMDL.MEF";
+    $command .= " -photcode-rule '{DETECTOR}.{FILTER.ID}.ForcedWarp'";
     $command .= " -tracedest $traceDest -log $logDest";
     $command .= " -dbname $dbname" if defined $dbname;

tags/ipp-pv3-cr-20140614/ippScripts/scripts/sc_transfer_tool.pl

@@ -51 +51 @@
 while(<I>) {
     chomp;
+    $i = int(rand($#filehandles));
+
     my $fline;
     if ($fetch) {
@@ -57 +59 @@
     if (($fetch)&&(!(-e $_))) {  # We are fetching, and do not already have this file.
         print { $filehandles[$i] } $fline;
-        $i++;
+#       $i++;
     }
     elsif (!($fetch)) { # We are pushing
 #       if (-e "${local_tmp}/$_") { 
             print { $filehandles[$i] } "${local_tmp}/$_" . "\n";
-            $i++;
+#           $i++;
 #       }
 #       else { # But somehow couldn't find the file we expected
@@ -69 +71 @@
 #       }
     }
-    if ($i >= $threads) { $i = 0; }
+#    if ($i >= $threads) { $i = 0; }
 }
 close(I);