Changeset 36072 for branches/eam_branches/ipp-20130711/ippScripts/scripts/chip_imfile.pl

Timestamp:

Aug 30, 2013, 4:52:14 PM (13 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20130711/ippScripts/scripts/chip_imfile.pl (modified) (4 diffs, 1 prop)

branches/eam_branches/ipp-20130711/ippScripts/scripts/chip_imfile.pl

@@ -233 +233 @@
     if ($do_photom and ($run_state eq 'update')) {
         # If previous psf file is ok skip photometry
-        if ($dump_config || rerun_photometry($outroot, $class_id)) {
+        if (rerun_photometry($outroot, $class_id)) {
             carp "Will rerun photometry\n";
         } else {
@@ -348 +348 @@
             }
         }
+        # resolve uri
+        my $uriReal = $ipprc->file_resolve( $uri );
+        # If instance is not found or if it doesn't exist try running neb-repair on it 
+        # Note: file_exists returns false if the file exists but has zero size
+        if (!$uriReal or !$ipprc->file_exists($uriReal)) {
+            my $repair_cmd = "$nebrepair $uri";
+            my ($repair_success, $repair_error_code, $repair_full_buf, $repair_stdout_buf, $repair_stderr_buf ) = run(command => $repair_cmd, verbose => $verbose);
+            unless ($repair_success) {
+                &my_die("Unable to attempt repair: $uri $repair_error_code", $exp_id,$chip_id, $class_id, $PS_EXIT_SYS_ERROR);
+            }
+            $uriReal = $ipprc->file_resolve( $uri );
+        }
+            
+        &my_die("Unable to resolve $uri on $host", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) if !$uriReal;
 
         # if recipe option PPIMAGE:APPLY.BURNTOOL is set and the burntool information is stored in
@@ -379 +393 @@
                                               UNLINK => !$save_temps, SUFFIX => '.fits' );
 
-            # get the UNIX version of the (possible) neb: or path: filename
-            my $uriReal = $ipprc->file_resolve( $uri );
-                # Catch errors here
-            if (!$uriReal) {
-                my $repair_cmd = "$nebrepair $uri";
-                my ($repair_success, $repair_error_code, $repair_full_buf, $repair_stdout_buf, $repair_stderr_buf ) = run(command => $repair_cmd, verbose => $verbose);
-                unless ($repair_success) {
-                    &my_die("Unable to attempt repair: $uri $repair_error_code", $exp_id,$chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-                }
-                $uriReal = $ipprc->file_resolve( $uri );
-            }
-                
-            &my_die("Unable to resolve $uri on $host", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) if !$uriReal;
-
             # funpack into the temp file.
             my $funpack_cmd = "$funpack -S $uriReal > $tempName";
@@ -492 +492 @@
     if ($no_compress_image) {
         $command .= " -R PPIMAGE.CHIP FITS.TYPE NONE";
+    }
+    if ($run_state eq 'update' and metadataLookupBool($recipeData, 'MASK.STATS')) {
+        $command .= " -Db PPIMAGE:MASK.STATS FALSE ";
     }
     $command .= $burntoolArguments if $burntoolArguments;