Changeset 39972

Timestamp:

Feb 2, 2017, 5:28:13 PM (9 years ago)

Author:

watersc1

Message:

merge from trunk of updated/tested version.

File:

• tags/ipp-20150312/ippScripts/scripts/permcheck.pl (modified) (5 diffs, 1 prop)

tags/ipp-20150312/ippScripts/scripts/permcheck.pl

@@ -266 +266 @@
                   'warp'   => ['PSWARP.OUTPUT','PSWARP.OUTPUT.MASK','PSWARP.OUTPUT.VARIANCE'],
                   'stack'  => ['PPSTACK.UNCONV.COMP','PPSTACK.UNCONV.MASK.COMP','PPSTACK.UNCONV.VARIANCE.COMP',
-                               'PPSTACK.UNCONV.EXP','PPSTACK.UNCONV.EXPNUM','PPSTACK.UNCONV.EXPWT.COMP'],
-                  'skycal' => ['PSASTRO.OUTPUT.CMF','PSPHOT.OUTPUT.CFF'],
-                  'ff'     => ['PSPHOT.OUT.CMF.MEF','PSPHOT.OUTPUT.CFF','PSPHOT.FULLFORCE.OUTPUT'],
+                               'PPSTACK.UNCONV.EXP','PPSTACK.UNCONV.EXPNUM','PPSTACK.UNCONV.EXPWT.COMP','PPSTACK.TARGET.PSF'],
+                  'skycal' => ['PSASTRO.OUTPUT.CMF','PSPHOT.OUTPUT.CFF','PSPHOT.STACK.PSF.SAVE','PSPHOT.STACK.BACKMDL'],
+                  'ff'     => ['PSPHOT.OUT.CMF.MEF','PSPHOT.OUTPUT.CFF','PSPHOT.FULLFORCE.OUTPUT','PSPHOT.PSF.SKY.SAVE'],
                   'diff'   => ['PPSUB.OUTPUT.SOURCES','PPSUB.INVERSE.SOURCES','PSPHOT.PSF.SKY.SAVE','PSPHOT.BACKMDL.MEF','PPSUB.OUTPUT.KERNELS'],
                   'burntool' => ['BURN.TABLE.DOESNT.HAVE.A.PRODUCT']
@@ -279 +279 @@
     my $hostname = $entry->{hostname};
     my $quality  = $entry->{quality};
+    
+    # Fixes burntool issues.
+    unless(defined($path_base)) { 
+        $path_base = 'NO_PB';
+    }
+    unless(defined($data_state)) {
+        $data_state = $entry->{data_state};
+    }
 
     $timer = time() - $timer_start;
@@ -337 +345 @@
                 foreach my $ff_entry (@$ff_files) {
                     my $ff_path_base = $ff_entry->{path_base};
-                    push @keys, $ipprc->filename($product,$ff_path_base);
+                    my $ff_skycell   = $ff_entry->{skycell_id};
+                    my $warp_id      = $ff_entry->{warp_id};
+                    if ($product ne 'PSPHOT.PSF.SKY.SAVE') {
+                        push @keys, $ipprc->filename($product,$ff_path_base);
+                    }
+                    else {
+                        my $warptool_cmd = "$warptool -warped -skycell_id $ff_skycell -warp_id $warp_id -dbname $dbname";
+                        ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 
+                            run(command => $warptool_cmd, verbose => 0);
+                        unless ($success) {
+                            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                            &my_die("Unable to perform stagetool: $error_code", $stage_id);
+                        }
+                        my $warp_files = $mdcParser->parse_list(join "", @$stdout_buf) or
+                            &my_die("Unable to parse metadata from stagetool", $stage_id);
+                        foreach my $wt_entry (@$warp_files) {
+                            my $wt_quality   = $wt_entry->{quality};
+                            if ($quality == 0) {
+                                my $wt_path_base = $wt_entry->{path_base};
+                                push @keys, $ipprc->filename($product,$wt_path_base,$ff_skycell);
+                            }
+                        }
+                    }               
                 }
                 $is_done = 1;
@@ -344 +374 @@
         elsif ($stage eq 'burntool') {
             if ($product eq 'BURN.TABLE.DOESNT.HAVE.A.PRODUCT') {
-                my $bt_file = $imfiles->{uri};
+                my $bt_state = $entry->{burntool_state};
+                if ($bt_state != -14) { next; }
+                my $bt_file = $entry->{uri};
                 $bt_file    =~ s/fits$/burn.tbl/;
                 push @keys, $bt_file;
-            }
-            $is_done = 1;
-        }
+
+                $is_done = 1;
+            }
+
+        }
+        elsif ($stage eq 'skycal') {
+            if (($product eq 'PSPHOT.STACK.PSF.SAVE')||($product eq 'PSPHOT.STACK.BACKMDL')) {
+                my $sky_id = $entry->{sky_id};
+                my $stack_id = $entry->{stack_id};
+                
+                my $ss_cmd = "$staticskytool -result -sky_id $sky_id -dbname $dbname";
+                my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 
+                    run(command => $ss_cmd, verbose => 0);
+                unless ($success) {
+                    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                    &my_die("Unable to perform stagetool: $error_code", $stage_id);
+                }
+                my $stack_files = $mdcParser->parse_list(join "", @$stdout_buf) or
+                    &my_die("Unable to parse metadata from stagetool", $stage_id);
+                foreach my $ss_entry (@$stack_files) {
+                    my $ss_path_base = $ss_entry->{path_base};
+                    push @keys, $ipprc->filename($product,$ss_path_base,$stack_id);
+                }
+                $is_done = 1;
+            }
+
+        }               
 
         if ($is_done == 0) {
@@ -372 +428 @@
         unless ($stat) {
             if (($stage eq 'camera')&&($key =~ /psf/)) {
+                warn "nebulous key: $key not found";
+            }
+            elsif (($stage eq 'ff')&&($key =~ /cff/)) {
                 warn "nebulous key: $key not found";
             }