Changeset 38152 for branches/eam_branches/ipp-20150405/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

Timestamp:

Apr 18, 2015, 6:27:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk (updates for pstamp, remote tools, ippToPsps schema 20)

Location:

branches/eam_branches/ipp-20150405

Files:

• . (modified) (1 prop)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (3 diffs)

branches/eam_branches/ipp-20150405/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -411 +411 @@
     my $release_args;
     if (($req_type eq 'byexp' and $stage ne 'raw') or ($req_type eq 'byskycell' and $stage ne 'diff')) {
-        # XXX: Think hard before committing the change to use releasetool for byexp requests regardless.
-        # XXX: using releasetool by default for byexp requests will break for nightly data when 
-        # the release table survey task breaks.
-        # (MOPS one off requests for last night's data)
-        # we could fall back and do the old style lookup in that case.
-        # Need to fix the duplicate camRun problem.
-        my $force_releasetool_for_byexp = 0;
-        if ($release_name or $survey or ($force_releasetool_for_byexp and ($req_type eq 'byexp'))) {
+        # we use releasetool for lookups if we get here and have a survey or release specfied and
+        # the survey is not 'bypass' 
+        # That is a hook to allow sophisticated users to bypass the release mechanisms. Useful for
+        # MOPS which is interested primarily in nightly data and wants to get their data immediately
+        # without regard to timeleness of the relexp tables
+        if ($release_name or ($survey and $survey ne 'bypass')) {  
             $use_releasetool = 1;
             if ($release_name) {
@@ -579 +577 @@
         # $cmf_name    = "PSPHOT.OUTPUT";    # this puts .fpa. in the name
         $psf_name    = "PPSTACK.TARGET.PSF";
+        # XXX TODO should we filter stacks so that only one per skycell/filter combintation is returned for
+        # most requests. Currently unless a release is provided all that match are returned.
+        # Actually maybe that is the right answer. User's simply need to specify a release value
+        # if that is all that they want.
     } else {
+        # this should have been caught before we get here.
         die "Unknown IMG_TYPE supplied: $stage";
     }
@@ -615 +618 @@
         $command .= " -dateobs_end $dateobs_end" if $dateobs_end;
     } elsif ($req_type ne "byid") {
+        # stacks
         $command .= " -mjd_obs_begin $mjd_min" if $mjd_min;
         $command .= " -mjd_obs_end $mjd_max" if $mjd_max;