Changeset 30103 for branches/eam_branches/ipp-20101205/pstamp

Timestamp:

Dec 17, 2010, 10:06:13 AM (16 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20101205/pstamp

Files:

• scripts/pstamp_job_run.pl (modified) (1 diff)
• scripts/pstampparse.pl (modified) (2 diffs)
• src/ppstampMakeStamp.c (modified) (1 diff)

branches/eam_branches/ipp-20101205/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);

branches/eam_branches/ipp-20101205/pstamp/scripts/pstampparse.pl

@@ -126 +126 @@
 }
 
+# Adjust the label for requests coming in over the web interaface
+
+my $label_changed = 0;
+if ($label and $label eq "WEB.UP") {
+    my $lcname = lc($req_name);
+    if ($lcname =~ /pitt/) {
+        $label = "PITT";
+        $label_changed = 1;
+    } elsif ($lcname =~ /cfa/) {
+        $label = "CFA";
+        $label_changed = 1;
+    } elsif ($lcname =~ /durham/) {
+        $label = "DURHAM";
+        $label_changed = 1;
+    } elsif ($lcname =~ /qub/) {
+        $label = "QUB";
+        $label_changed = 1;
+    }
+    print "Setting label for $req_name to $label\n" if $label_changed;
+}
+
+
 if ($req_id and !$no_update) {
     # update the database with the request name. This will be used as the
@@ -131 +153 @@
     my $command = "$pstamptool -updatereq -req_id $req_id  -set_name $req_name";
     $command .= " -set_outProduct $product";
+    $command .= " -set_label $label" if $label_changed;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);

branches/eam_branches/ipp-20101205/pstamp/src/ppstampMakeStamp.c

@@ -320 +320 @@
         }
         if (readout->mask) {
-            outReadout->mask = extractStamp(readout->mask, extractRegion,  0);
+            psImageMaskType maskInitValue = pmConfigMaskGet("BLANK", config);
+            outReadout->mask = extractStamp(readout->mask, extractRegion,  maskInitValue);
             if (!outReadout->mask) {
                 psError(PS_ERR_UNKNOWN, false, "failed to create postage stamp mask image\n");