Changeset 39971 for trunk

Timestamp:

Feb 2, 2017, 5:27:30 PM (9 years ago)

Author:

watersc1

Message:

Update to skip cff if they do not exist for ff (which maybe they universally don't? Not clear). Update stack photometry product names after testing.

File:

• trunk/ippScripts/scripts/permcheck.pl (modified) (4 diffs)

trunk/ippScripts/scripts/permcheck.pl

@@ -267 +267 @@
                   'stack'  => ['PPSTACK.UNCONV.COMP','PPSTACK.UNCONV.MASK.COMP','PPSTACK.UNCONV.VARIANCE.COMP',
                                'PPSTACK.UNCONV.EXP','PPSTACK.UNCONV.EXPNUM','PPSTACK.UNCONV.EXPWT.COMP','PPSTACK.TARGET.PSF'],
-                  'skycal' => ['PSASTRO.OUTPUT.CMF','PSPHOT.OUTPUT.CFF','PSPHOT.PSF.SKY.SAVE','PSPHOT.BACKMDL.MEF'],
+                  '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'],
@@ -361 +361 @@
                             &my_die("Unable to parse metadata from stagetool", $stage_id);
                         foreach my $wt_entry (@$warp_files) {
-                            my $wt_path_base = $wt_entry->{path_base};
-                            push @keys, $ipprc->filename($product,$wt_path_base,$ff_skycell);
+                            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);
+                            }
                         }
                     }               
@@ -382 +385 @@
         }
         elsif ($stage eq 'skycal') {
-            if (($product eq 'PSPHOT.PSF.SKY.SAVE')||($product eq 'PSPHOT.BACKMDL.MEF')) {
+            if (($product eq 'PSPHOT.STACK.PSF.SAVE')||($product eq 'PSPHOT.STACK.BACKMDL')) {
                 my $sky_id = $entry->{sky_id};
                 my $stack_id = $entry->{stack_id};
@@ -425 +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";
             }