Changeset 30118 for branches/czw_branch/20101203/pstamp/scripts/pstamp_job_run.pl

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• pstamp/scripts/pstamp_job_run.pl (modified) (1 diff)

branches/czw_branch/20101203/pstamp/scripts/pstamp_job_run.pl

@@ -277 +277 @@
         # silently skip them if they don't exist. Perhaps this should be
         # detected in pstampparse so that the user can be notified with 
-        # a message in parse_error.txt ("warp do not have a background model")
-        my $cmf_file = $params->{cmf} if ($options & $PSTAMP_SELECT_CMF);
+        # a message in parse_error.txt ("warp does not have a background model")
         my $psf_file = $params->{psf} if ($options & $PSTAMP_SELECT_PSF);
         my $backmdl_file = $params->{backmdl} if ($options & $PSTAMP_SELECT_BACKMDL);
         my $pattern_file = $params->{pattern} if ($options & $PSTAMP_SELECT_BACKMDL);
+        my $cmf_file;
+        if ($stage ne 'chip') {
+            # we don't ship chip stage cmf files because they may not be censored
+            $cmf_file = $params->{cmf} if ($options & $PSTAMP_SELECT_CMF);
+        }
 
         my $outdir = dirname($output_base);