Changeset 36952

Timestamp:

Jul 1, 2014, 2:23:27 PM (12 years ago)

Author:

watersc1

Message:

Merge of final scripts from trunk.

Location:

tags/ipp-pv3-20140616/ippScripts

Files:

• . (modified) (1 prop)
• Build.PL (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• scripts/sc_prepare_camera.pl (modified) (1 prop)
• scripts/sc_prepare_stack.pl (modified) (2 diffs)
• scripts/sc_prepare_warp.pl (modified) (1 diff)
• scripts/sc_transfer_tool.pl (modified) (3 diffs)

tags/ipp-pv3-20140616/ippScripts/Build.PL

@@ -135 +135 @@
         scripts/psphot_fullforce_warp.pl
         scripts/psphot_fullforce_summary.pl
-        scripts/stack_bkg_mk_mdc.pl
+        scripts/sc_mk_stack_mdc.pl
+        scripts/sc_prepare_camera.pl
+        scripts/sc_prepare_chip.pl
+        scripts/sc_prepare_stack.pl
+        scripts/sc_prepare_warp.pl
+        scripts/sc_remote_exec.pl
+        scripts/sc_transfer_tool.pl
+        scripts/sc_validate_files.pl
+        scripts/sc_validate_processing.pl
     )],
     dist_abstract => 'Scripts for running the Pan-STARRS IPP',

tags/ipp-pv3-20140616/ippScripts/MANIFEST

@@ -49 +49 @@
 scripts/lap_science.pl
 scripts/regenerate_background.pl
+scripts/sc_mk_stack_mdc.pl
+scripts/sc_prepare_camera.pl
+scripts/sc_prepare_chip.pl
+scripts/sc_prepare_stack.pl
+scripts/sc_prepare_warp.pl
+scripts/sc_remote_exec.pl
+scripts/sc_transfer_tool.pl
+scripts/sc_validate_files.pl
+scripts/sc_validate_processing.pl
 t/00_distribution.t

tags/ipp-pv3-20140616/ippScripts/scripts/sc_prepare_stack.pl

@@ -168 +168 @@
         my $remote_path_base = uri_local_to_remote($warp_path_base);
         $warp_path_base_string .= " $remote_path_base ";
+
+        # Append file names to transfer lists so we can recover if warps are deleted.
+        uri_to_outputs($warp_path_base . ".fits");
+        uri_to_outputs($warp_path_base . ".wt.fits");
+        uri_to_outputs($warp_path_base . ".mask.fits");
+        uri_to_outputs($warp_path_base . ".cmf");
+#       uri_to_outputs($warp_path_base . ".psf");
     }
     my $mk_mdc_command = "mkdir -p $remote_outdir && sc_mk_stack_mdc.pl $warp_path_base_string > ${remote_outroot}.in.mdc";
@@ -182 +189 @@
     $ppstack_command    .= " -R PPSTACK.UNCONV.VARIANCE FITS.TYPE COMP_STACK";
     $ppstack_command    .= " -tracedest ${remote_outroot}.trace -log ${remote_outroot}.log ";
-    $ppstack_command    .= " -threads 10 ";
+    $ppstack_command    .= " -threads 4 ";
     $ppstack_command    .= " -dumpconfig ${remote_outroot}.mdc ";
     $ppstack_command    .= " -stack_id $stack_id -skycell_id $skycell_id -tess_id $tess_id ";

tags/ipp-pv3-20140616/ippScripts/scripts/sc_prepare_warp.pl

@@ -27 +27 @@
 my $max_time      = 8;                      # longest allocation to ask for
 my $remote_hostname= "LANL/Mustang";         # Name of the remote node.
-my @return_component_list = ("DBINFO.EXP", "PSWARP.CONFIG", "PSWARP.OUTPUT", "PSWARP.OUTPUT.MASK", "PSWARP.OUTPUT.VARIANCE", "PSWARP.OUTPUT.SOURCES","LOG.EXP","TRACE.EXP");
+my @return_component_list = ("DBINFO.EXP", "PSWARP.CONFIG", "PSWARP.OUTPUT", "PSWARP.OUTPUT.MASK", "PSWARP.OUTPUT.VARIANCE", "PSWARP.OUTPUT.SOURCES","PSPHOT.PSF.SAVE","LOG.EXP","TRACE.EXP");
 # Look for programs we need
 my $missing_tools;

tags/ipp-pv3-20140616/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);