Changeset 34212

Timestamp:

Jul 26, 2012, 2:59:12 PM (14 years ago)

Author:

bills

Message:

In bycoord or byskycell postage stamp requests if the user does not specifiy a data group
select from a list of data_groups specified in the recipe. This will make it more likely
that users will get stamps from data that we intended to "release".

Also insure that byskycell requests are filtered so that only 1 run per exposure is returned.

Location:

trunk

Files:

• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (6 diffs)
• ippconfig/recipes/Makefile.am (modified) (1 diff)
• ippconfig/recipes/pstamp.config (added)
• ippconfig/system.config (modified) (1 diff)

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -48 +48 @@
 my ($regtool, $chiptool, $camtool, $warptool, $stacktool, $difftool);
 my ($pstamptool, $dvoImagesAtCoords, $whichimage, $ppConfigDump);
+
+my $default_data_groups = "";
 
 sub locate_images {
@@ -76 +78 @@
            ($req_type ne "byskycell");
 
+    $default_data_groups = load_data_groups($verbose);
 
     my $dateobs_begin;
@@ -342 +345 @@
         die "tess_id and component are required for byskycell" if !$tess_id or ! $skycell_id;
         $command .= " -tess_id $tess_id -skycell_id $skycell_id";
+        $filter_runs = 1;
     } else {
         # this should be caught by caller
@@ -357 +361 @@
 
     $command .= " -filter $filter" if !isnull($filter);
-    $command .= " -data_group $data_group" if !isnull($data_group);
+
+    if (!isnull($data_group)) {
+        $command .= " -data_group $data_group";
+    } elsif ($req_type eq 'byskycell') {
+        $command .= $default_data_groups;
+    }
 
     my $images = runToolAndParse($command, $verbose);
@@ -727 +736 @@
            # always the case. If this turns out to be a problem we can defer
            # the data_group test to when we look up the chipProcessedImfiles
-           $command .= " -data_group $data_group" if $data_group;
+           if ($data_group) {
+               $command .= " -data_group $data_group";
+           } else {
+               $command .= $default_data_groups;
+           }
            $command .= " -destreaked" if $need_magic;
 
@@ -1409 +1422 @@
 }
 
+sub load_data_groups {
+    my $verbose = shift;
+    my $command = "$ppConfigDump -dump-recipe PSTAMP -";
+
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => $verbose);
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        die("Unable to perform ppConfigDump: $error_code");
+    }
+    my $mdcParser = PS::IPP::Metadata::Config->new;
+    my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
+        die ("Unable to parse metadata config doc");
+
+    my $data_group_string = "";
+    foreach my $item (@$metadata) {
+        my $tag = $item->{name};
+        next if $tag ne "DATA_GROUP";
+        my $dg = $item->{value};
+#        print "adding $dg to list of default data groups\n";
+        $data_group_string .= " -data_group $dg";
+    }
+    return $data_group_string;
+}
+
 sub my_die
 {

trunk/ippconfig/recipes/Makefile.am

@@ -32 +32 @@
         ppVizPSF.mdc \
         nightly_science.config \
-        ppBackground.mdc
+        ppBackground.mdc \
+        pstamp.config
 
 install_DATA = $(install_files)

trunk/ippconfig/system.config

@@ -63 +63 @@
         PPBACKGROUND    STR             recipes/ppBackground.mdc       # Background restoration
         PSVIDEOPHOT     STR             recipes/psvideophot.config # video cell photometry
+        PSTAMP          STR             recipes/pstamp.config       # postage stamp server
 END