Changeset 36104 for trunk/pstamp

Timestamp:

Sep 10, 2013, 12:32:12 PM (13 years ago)

Author:

bills

Message:

For stack_summary stage support requests for exp and num jpeg images.
Note that no way to request the jpegs for the weight and fits images.
I assert that these are not generally useful. To get them one must request bundles

Location:

trunk/pstamp

Files:

• scripts/pstamp_job_run.pl (modified) (3 diffs)
• test/gpc1/stacksummary.bycoord.all.txt (added)
• test/gpc1/stacksummary.bycoord.txt (modified) (1 diff)

trunk/pstamp/scripts/pstamp_job_run.pl

@@ -236 +236 @@
                            $PSTAMP_SELECT_JPEG     => 'jpg',
                            $PSTAMP_SELECT_EXP      => 'exp.fits',
-                           $PSTAMP_SELECT_NUM      => 'num.fits');
+                           $PSTAMP_SELECT_NUM      => 'num.fits',
+                           $PSTAMP_SELECT_EXPJPEG  => 'exp.jpg',
+                           $PSTAMP_SELECT_NUMJPEG  => 'num.jpg');
 
         my $output_mask = $options & ($PSTAMP_SELECT_IMAGE | $PSTAMP_SELECT_MASK | $PSTAMP_SELECT_VARIANCE 
-            | $PSTAMP_SELECT_JPEG | $PSTAMP_SELECT_SOURCES | $PSTAMP_SELECT_EXP | $PSTAMP_SELECT_NUM);
+            | $PSTAMP_SELECT_JPEG | $PSTAMP_SELECT_SOURCES
+            | $PSTAMP_SELECT_EXP | $PSTAMP_SELECT_NUM 
+            | $PSTAMP_SELECT_EXPJPEG | $PSTAMP_SELECT_NUMJPEG);
+
 
         foreach my $key (keys (%extensions)) {
@@ -573 +578 @@
     $params->{exp}    = $path_base . ".exp.b1.fits";
     $params->{num}    = $path_base . ".num.b1.fits";
+    $params->{expjpeg} = $path_base . ".exp.0.b1.jpeg";
+    $params->{numjpeg} = $path_base . ".num.0.b1.jpeg";
 }
 
@@ -632 +639 @@
         if (!myCopy("$outputBase.num.fits", $params->{num}, 'num', 0)) {
             $options &= ~$PSTAMP_SELECT_NUM;
+        }
+    }
+    if ($options & $PSTAMP_SELECT_EXPJPEG) {
+        if (!myCopy("$outputBase.exp.jpg", $params->{expjpeg}, 'exp', 0)) {
+            $options &= ~$PSTAMP_SELECT_EXPJPEG;
+        }
+    }
+    if ($options & $PSTAMP_SELECT_NUMJPEG) {
+        if (!myCopy("$outputBase.num.jpg", $params->{numjpeg}, 'num', 0)) {
+            $options &= ~$PSTAMP_SELECT_NUMJPEG;
         }
     }

trunk/pstamp/test/gpc1/stacksummary.bycoord.txt

@@ -4 +4 @@
 CHANGEME 2 PROCESS null
 #  ROWNUM CENTER_X CENTER_Y WIDTH HEIGHT COORD_MASK JOB_TYPE OPTION_MASK PROJECT SURVEY_NAME IPP_RELEASE REQ_TYPE IMG_TYPE ID TESS_ID COMPONENT DATA_GROUP REQFILT MJD_MIN MJD_MAX RUN_TYPE FWHM_MIN FWHM_MAX | COMMENT
-1     359.767   -30.2009     100    100   2      stamp      455         gpc1      3PI         null     bycoord   stack_summary  null RINGS.V3 null   LAP.ThreePI.20130717%      r        0      0        null      0        0    | 
+1     359.767   -30.2009     100    100   2      stamp      1        gpc1      3PI         null     bycoord   stack_summary  null RINGS.V3 null   LAP.ThreePI.20130717%      r        0      0        null      0        0    |