Changeset 36633 for trunk/ippScripts

Timestamp:

Apr 2, 2014, 10:50:14 AM (12 years ago)

Author:

bills

Message:

Merge with ipp-20140401 (The staticsky tag)

Location:

trunk

Files:

• . (modified) (1 prop)
• ippScripts/scripts/dist_defineruns.pl (modified) (1 diff)
• ippScripts/scripts/dist_make_fileset.pl (modified) (1 diff)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/psphot_fullforce_summary.pl (modified) (3 diffs)
• ippScripts/scripts/publish_file.pl (modified) (1 prop)

trunk/ippScripts/scripts/dist_defineruns.pl

@@ -88 +88 @@
     push @stages, $stage;
 } else {
-    @stages = qw(chip chip_bg camera fake warp warp_bg diff stack SSdiff sky skysingle);
+    @stages = qw(chip chip_bg camera fake warp warp_bg diff stack SSdiff sky skysingle ff);
 }
 

trunk/ippScripts/scripts/dist_make_fileset.pl

@@ -223 +223 @@
     my $dbname = shift;
 
-    if (($stage eq 'stack') or ($stage eq 'diff') or ($stage eq 'SSdiff') or $stage eq 'sky' or $stage eq 'skycal') {
+    if (($stage eq 'stack') or ($stage eq 'diff') or ($stage eq 'SSdiff') or $stage eq 'sky' or $stage eq 'skycal' or $stage eq "ff") {
         return "";
     }

trunk/ippScripts/scripts/psphot_fullforce_summary.pl

@@ -79 +79 @@
 my ($listFile, $listName) = tempfile("/tmp/fullforce.summary.list.XXXX", UNLINK => !$save_temps );
 
+my $cff_file;
+
 { 
     my $mdcParser = PS::IPP::Metadata::Config->new;
@@ -107 +109 @@
         &my_die("Couldn't find input cmf: $cmf", $ff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($cmf);
         print $listFile "SOURCES STR $cmf\n";
+        if (!$cff_file) {
+            $cff_file = $ipprc->filename('PSPHOT.OUTPUT.CFF', $result->{sources_path_base});
+            &my_die("Couldn't find input cff: $cff_file", $ff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($cff_file);
+        }
     }
     close $listFile;
 }
+
+&my_die("No CFF found in results: $cff_file", $ff_id, $PS_EXIT_PROG_ERROR) unless $cff_file;
+
 
 # Recipes to use based on reduction class
@@ -141 +150 @@
     my $command = "$psphotFullForceSummary $outroot";
     $command .= " -input $listName";
+    $command .= " -cff $cff_file";
     $command .= " -threads $threads" if defined $threads;
     if ($dump_config) {