Changeset 38121 for tags/ipp-20150329

Timestamp:

Apr 13, 2015, 6:15:47 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

tags/ipp-20150329/ippScripts

Files:

• Build.PL (modified) (2 diffs)
• MANIFEST (modified) (1 diff)
• scripts/addstar_run.pl (modified) (1 diff)
• scripts/diff_skycell.pl (modified) (2 diffs)
• 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_camera.pl (modified) (1 diff)
• scripts/sc_prepare_diff.pl (copied) (copied from trunk/ippScripts/scripts/sc_prepare_diff.pl )
• scripts/sc_prepare_run.pl (modified) (3 diffs)
• scripts/sc_remote_poll.pl (modified) (1 diff)
• scripts/skycalibration.pl (modified) (1 diff)

tags/ipp-20150329/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-20150329/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-20150329/ippScripts/scripts/addstar_run.pl

@@ -102 +102 @@
 
 if ($stage =~/fullforce/) {
+    $reduction='DEFAULT';
+    #hardwired because why not
+}
+if ($stage =~/diff/) {
     $reduction='DEFAULT';
     #hardwired because why not

tags/ipp-20150329/ippScripts/scripts/diff_skycell.pl

@@ -128 +128 @@
 #     $use_convolved = 1; ## This is a hack to do a test for mops, and should not be committed.
 # }
+
+# Re-implement prescan to decide if this is a warp-stack or warp-warp.  Or stack-stack, but that's what we don't care about now.
+my $diff_type = '';
+
+if ((${ $files }[0]->{warp_id} != 0)&&(${ $files }[1]->{warp_id} != 0)) {
+    $diff_type = "WW";
+}
+elsif ((${ $files }[0]->{stack_id} != 0)&&(${ $files }[1]->{stack_id} != 0)) {
+    $diff_type = "SS";
+}
+elsif (((${ $files }[0]->{warp_id} != 0)&&(${ $files }[1]->{stack_id} != 0))) {
+    $diff_type = "WS";
+}
+else {  # Something has gone horribly wrong.
+    $diff_type = "WW"; # just pretend it never happened, and let it fail elsewhere.
+}
 
 # ppSub does (input) - (template) after PSF-match convolution.  
@@ -254 +270 @@
 &my_die("Couldn't find input: $templateMask", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateMask);
 &my_die("Couldn't find input: $templateVariance", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateVariance);
-&my_die("Couldn't find input: $templateSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateSources);
+#&my_die("Couldn't find input: $templateSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateSources);
+
+if ($diff_type eq 'WS') {
+    # LANL processed stack images do not have a set of sources transferred back, so we need to choose a different source list.
+    unless($ipprc->file_exists($templateSources)) {
+        if ($ipprc->file_exists($inputSources)) {
+            $templateSources = $inputSources;
+            print "CHANGED:templateSources: $templateSources\n";
+        }
+    }
+    &my_die("Couldn't find input: $templateSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateSources);
+}
+else {
+    &my_die("Couldn't find input: $templateSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateSources);
+}
 &my_die("Couldn't find input: $input", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input);
 &my_die("Couldn't find input: $inputMask", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputMask);

tags/ipp-20150329/ippScripts/scripts/sc_prepare_camera.pl

@@ -90 +90 @@
 my ($workdir,$exp_tag,$reduction);
 {
+
 ###    $command    = "$camtool -processedexp -cam_id $cam_id "; ### THIS LINE ONLY TO TEST!  
     my $command = "$camtool -pendingexp -cam_id $cam_id ";

tags/ipp-20150329/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"}  = 1500 / 60 / 60;
 $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"}  = 3;
 $job_subscription{"staticsky"} = 3;
+$job_subscription{"diff"} = 1;
 
 my $proc_per_node = 24;                     # processors per node

tags/ipp-20150329/ippScripts/scripts/sc_remote_poll.pl

@@ -510 +510 @@
         ($class_id, $stage_id) = $file =~ /(skycell.\d\d\d\d.\d\d\d).stk.(\d*).dbinfo/;
     }
-
+    elsif ($stage eq 'staticsky') {
+#       ($class_id, $stage_id) = $file =~ /(/;
+    }
+    elsif ($stage eq 'diff') {
+#       ($class_id,$stage_id) = $file =~ /(/;
+    }
     return ($stage_id, $class_id);
 }

tags/ipp-20150329/ippScripts/scripts/skycalibration.pl

@@ -122 +122 @@
 my $recipe_psphot = $ipprc->reduction($reduction, "STACKPHOT_PSPHOT");
 unless ($recipe_psphot) {
-    &my_die("Couldn't find selected reduction for STATCKPHOT_PSPHOT: $reduction\n", $skycal_id, $PS_EXIT_CONFIG_ERROR);
+    &my_die("Couldn't find selected reduction for STACKPHOT_PSPHOT: $reduction\n", $skycal_id, $PS_EXIT_CONFIG_ERROR);
 }