Changeset 37838 for trunk/pstamp/scripts

Timestamp:

Jan 12, 2015, 1:03:56 PM (12 years ago)

Author:

eugene

Message:

merging changes from ipp-pv3-20140717 (via branches/eam_branches/ipp-pv3-20140717-merge)

Location:

trunk/pstamp/scripts

Files:

• psmkreq (modified) (3 diffs)
• pstamp_checkdependent.pl (modified) (1 prop)
• pstamp_finish.pl (modified) (1 prop)
• pstamp_job_run.pl (modified) (1 prop)
• pstampparse.pl (modified) (1 prop)
• request_finish.pl (modified) (1 prop)

trunk/pstamp/scripts/psmkreq

@@ -30 +30 @@
 
 my ($image, $mask, $variance, $jpeg, $cmf, $psf, $backmdl, $inverse, $restorebackground);
+my ($exptime, $expnum, $exptimejpeg, $expnumjpeg);
 my ($convolved, $unconvolved, $uncompressed, $use_imfile_id, $no_wait);
 
@@ -116 +117 @@
     'psf'               => \$psf,
     'backmdl'           => \$backmdl,
+    'exptime'           => \$exptime,
+    'expnum'            => \$expnum,
+    'exptimejpeg'       => \$exptimejpeg,
+    'expnumjpeg'        => \$expnumjpeg,
     'inverse'           => \$inverse,
     'unconvolved'       => \$unconvolved,
@@ -217 +222 @@
         $option_mask = $PSTAMP_SELECT_IMAGE    if $option_mask == 0;
 
-
         $option_mask |= $PSTAMP_SELECT_CMF      if $cmf;
         $option_mask |= $PSTAMP_SELECT_PSF      if $psf;
         $option_mask |= $PSTAMP_SELECT_BACKMDL  if $backmdl;
+        $option_mask |= $PSTAMP_SELECT_EXP      if $exptime;
+        $option_mask |= $PSTAMP_SELECT_NUM      if $expnum;
+        $option_mask |= $PSTAMP_SELECT_EXPJPEG  if $exptimejpeg;
+        $option_mask |= $PSTAMP_SELECT_NUMJPEG  if $expnumjpeg;
         $option_mask |= $PSTAMP_SELECT_UNCOMPRESSED if $uncompressed;
         $option_mask |= $PSTAMP_SELECT_UNCONV   if $unconvolved;