Changeset 38106 for tags/ipp-pv3-20140717

Timestamp:

Apr 10, 2015, 4:01:00 PM (11 years ago)

Author:

watersc1

Message:

Merge from trunk to handle remote diffs

Location:

tags/ipp-pv3-20140717/ippScripts

Files:

• Build.PL (modified) (2 diffs, 1 prop)
• MANIFEST (modified) (1 diff, 1 prop)
• scripts/lap_queue_diff.pl (copied) (copied from trunk/ippScripts/scripts/lap_queue_diff.pl )
• scripts/sc_check_diff.pl (copied) (copied from trunk/ippScripts/scripts/sc_check_diff.pl )
• scripts/sc_prepare_diff.pl (copied) (copied from trunk/ippScripts/scripts/sc_prepare_diff.pl )
• scripts/sc_prepare_run.pl (modified) (3 diffs, 1 prop)

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

@@ -128 +128 @@
         scripts/diffphot.pl
         scripts/lap_science.pl
+        scripts/lap_queue_diff.pl
         scripts/videophot_process.pl
         scripts/listvideocells.pl
@@ -139 +140 @@
         scripts/sc_mk_stack_mdc.pl
         scripts/sc_mk_staticsky_mdc.pl
+        scripts/sc_check_diff.pl
         scripts/sc_prepare_camera.pl
         scripts/sc_prepare_chip.pl
         scripts/sc_prepare_stack.pl
         scripts/sc_prepare_staticsky.pl
+        scripts/sc_prepare_diff.pl
         scripts/sc_prepare_warp.pl
         scripts/sc_prepare_run.pl

tags/ipp-pv3-20140717/ippScripts/MANIFEST

@@ -49 +49 @@
 scripts/skycell_jpeg.pl
 scripts/lap_science.pl
+scripts/lap_queue_diff.pl
 scripts/regenerate_background.pl
 scripts/sc_mk_stack_mdc.pl
 scripts/sc_mk_staticsky_mdc.pl
+scripts/sc_check_diff.pl
 scripts/sc_prepare_camera.pl
 scripts/sc_prepare_chip.pl
 scripts/sc_prepare_stack.pl
 scripts/sc_prepare_staticsky.pl
+scripts/sc_prepare_diff.pl
 scripts/sc_prepare_warp.pl
 scripts/sc_remote_exec.pl

tags/ipp-pv3-20140717/ippScripts/scripts/sc_prepare_run.pl

@@ -24 +24 @@
 # my $remote_root   = '/lustre/scratch1/turquoise/watersc1/ps1/'; # Far side destination base location
 my $remote_root = '/scratch3/watersc1/';
-my $remote_raw    = "${remote_root}/tmp/";  # Directory to find raw data in.
-
-my $threads       = 2;                      # How many threads are we going to use?
+my $remote_raw  = "${remote_root}/tmp/";  # Directory to find raw data in.
+
+my $threads     = 2;                      # How many threads are we going to use?
 
 my $fail_state = "prep_fail";
@@ -37 +37 @@
 $job_cost{"stack"}  = 2; # 1500 / 60 / 60; ## deep ~100 input stacks seem to take about 2 hours 
 $job_cost{"staticsky"} = 2; # really?  avg time of 5720s?
+$job_cost{"diff"}   = 300 / 60 / 60;
 
 # This object holds how "expensive" a given job is in terms of cores on a node.  
@@ -46 +47 @@
 $job_subscription{"stack"}  = 24; # This should reserve the entire node for stack.
 $job_subscription{"staticsky"} = 3;
+$job_subscription{"diff"} = 1;
 
 my $proc_per_node = 24;                     # processors per node